Merge branch 'ticket/135' into develop

James Moger

2014-09-26 ba04d6d62e443cbd23c0544094aa2e55d01b2d0f

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