Merge release 1.6.0

James Moger

2014-06-16 111b48c40cd2cc4e19e28c8b6af8379885fb617b

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