Merge branch 'ticket/199' into develop

James Moger

2014-09-30 5759941c21e106c864a672ec4e5e4b10fa2310ed

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