Merge branch 'ticket/152' into develop

James Moger

2014-09-04 21fe98ebf8687f68cffbe6b6b8dec0073e93c541

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