Merge branch 'ticket/87' into develop

James Moger

2014-05-29 e6ba88ec330241395b10d2e487b33b77672857a3

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