Merge branch 'ticket/175' into develop

James Moger

2014-09-11 6a00a29e9f9ee03ad2abc89c8faa4af1857c0515

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