Merge branch 'ticket/205' into develop

James Moger

2014-10-14 852c5263ca3a779d9cc1c4990ebccbc070507c27

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