Merge branch 'ticket/161' into develop

James Moger

2014-09-08 14181da41a98817aef2b528f92d58613e61e495f

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