Merge release 1.6.1

James Moger

2014-10-20 9984ea8f5d9fad31a5e68935756ca8eb406d6b2c

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