Merge branch 'ticket/129' into develop

James Moger

2014-09-30 f685ea581f94373a63bcdc94ec417fdf92a95d68

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