Merge branch 'ticket/173' into develop

James Moger

2014-09-08 9f84ef0ea05076b3f063837dc8c241fcf6b6104b

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