Merge branch 'ticket/136' into develop

James Moger

2014-09-30 1e5905b8da9b76356c99a3d94b2ca9068ffe1c93

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