Merge branch 'ticket/114' into develop

James Moger

2014-06-27 7d75e2b646da990c9041f91fe41fdc892bbaf977

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