Merge non-fast-forward for release branch merges

James Moger

2014-06-16 9186c6413e7cdfc33527ca69d2e56dfec6d8b760

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