Merge branch 'ticket/200' into develop

James Moger

2014-09-30 ecc298bc65dbe75793e8956d89ac3d1a25dddd91

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