Merge branch 'ticket/202' into develop

James Moger

2014-10-06 12f1be179dfb6f02b1a59594d36a9663a2d78742

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