Merge branch 'ticket/82' into develop

James Moger

2014-05-22 865fbed8c04376969eda48d66b767adc29f17948

1
2
3
4
[user "admin"]
    password = admin
    role = "#admin"
    role = "#notfederated"