Merge branch 'ticket/174' into develop

James Moger

2014-09-08 871ea2592a9798aa078b19ba37cd6a87990e1712

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