Merge branch 'ticket/195' into develop

James Moger

2014-09-30 3513117364394110f6ae8d5264602f1e1a7fcf1f

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