Merge branch 'develop' into ticket-57_develop

Eddy Young

2015-05-22 410c92f5c71c93cd2b4b0a1d9ee4067c34b80c66

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