Merge branch 'ticket/54' into develop

James Moger

2014-05-07 ae6db865961bca99f13cf6f5658c8265765d7b48

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