Merge branch 'ticket/84' into develop

James Moger

2014-05-23 68ae0d32ea896155e5b611d10c1663b674c3a220

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