Merge branch 'ticket/91' into develop

James Moger

2014-05-29 38ba369972fe7e01a8ef6a950fd9bd403ef97eb6

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