Merge branch 'ticket/188' into develop

James Moger

2014-09-25 459ac5c56f5af296c2e5375be84abe384e6410af

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