Merge branch 'ticket/142' into develop

James Moger

2014-09-04 8b1d0aed40b4fc3ed5b30aa824a4c2924b788454

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