Merge branch 'ticket/62' into develop

James Moger

2014-05-07 e7bb5589b18b2bd176ef0cd152e0737c2f5dfa4c

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