Merge branch 'ticket/170' into develop

James Moger

2014-09-08 671b5a456c48028d21855fe05c1fbc9013a180b7

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