Merge branch 'ticket/180' into develop

James Moger

2014-09-17 ad3d2ca074cd3cf9c554f57c53b22f0de6abede9

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