Merge branch 'ticket/120' into develop

James Moger

2014-07-01 55db9a94272c0770262813807c923d5e092c93ca

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