Merge branch 'ticket/108' into develop

James Moger

2014-06-18 51241eadb22b08f01945fa9701eca5419ff38aa6

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