Merge branch 'ticket/71' into develop

James Moger

2014-05-12 a3dd0d0416fe093852293bcedb83c9b1e6fe06cb

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