Remove garbage from a bad squash & cherry-pick

James Moger

2014-03-07 81ae0d044632ebd8f0eecbc443bc0e9e9af0b9ab

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