Merge branch 'ticket/148' into develop

James Moger

2014-09-04 8d9750ef65660ca2488fc8ff65ba9c1040143c71

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