Merge branch 'ticket/164' into develop

James Moger

2014-09-07 f7174e6984c08a153d1ba198c4bffe68c5afd873

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