Merge branch 'ticket/245' into develop

James Moger

2015-03-07 d40a44c8c8df8f6bd81c93e72314224f85656f18

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