Merge release 1.6.0

James Moger

2014-06-16 6b18b0761b726fd9aef1ebcc21b760378f7d4b5c

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