Merge branch 'ticket/201' into develop

James Moger

2014-09-30 c75da1949805e4159d1c209c8680ab335fd6f5c3

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