Merge branch 'ticket/70' into develop

James Moger

2014-05-12 e832a7d1a077a067755b7f8d4996d57b95e85eea

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