Merge branch 'ticket/198' into develop

James Moger

2014-09-30 136fbddd52fba5a06e3c833dce5460cf11f2d5be

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