Merge branch 'ticket/239' into develop

James Moger

2015-02-26 7b04a90472d103ba35f5a943f6a7ec60c286de92

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