Merge branch 'ticket/237' into develop

James Moger

2015-02-11 5ec94c4282ed3630b7b4cd0fb5db62c20ce46d9d

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