Merge branch 'ticket/177' into develop

James Moger

2014-09-11 5399d90cefd707e9bf3f9ef7e1f9e6b40d68a955

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