Merge branch 'ticket/141' into develop

James Moger

2014-09-04 969656cd8f417378d9840a246dca698ff8d16551

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