Merge branch 'ticket/166' into develop

James Moger

2014-09-05 cf9f80f5d576fa27bd34cc8f880d9eb5c4c619c8

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