Merge branch 'ticket/185' into develop

James Moger

2014-09-24 2fb843db2702f5f6d1df784d53dd6cbba286f4f3

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