Merge branch 'ticket/150' into develop

James Moger

2014-09-04 29183e1b834195122da19bc3112e85bf3280f541

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