Merge branch 'master' into issues

James Moger

2012-01-13 0256e6aa26ebb51416d290d772897caf84a1cd82

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