Merge branch 'ticket/165' into develop

James Moger

2014-09-05 668a0d65fe393986c662a62f667204872582d93f

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