Merge branch 'ticket/117' into develop

James Moger

2014-06-27 5bcb9448de01e33c23d6cebfdc03164469d5bc3d

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