Merge branch 'ticket/143' into develop

James Moger

2014-09-04 c70fcce5db7172a9c0a1f1347ef5db1453e23350

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