Merge branch 'ticket/69' into develop

James Moger

2014-05-09 45347a60645625d6634767d1b63753de416d215c

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