Merge branch 'ticket/111' into develop

James Moger

2014-06-22 2567f9404f32fcbd968b653a35169a5949a49216

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