Merge remote-tracking branch 'upstream/master'

David Ostrovsky

2013-04-14 94793ed10acf996a4b3f9f1a8538a1b997436d9f

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