Merge remote-tracking branch 'upstream/master' into translation_to_pt-br

Rafael Cavazin

2012-12-07 6b35f8c32de5ebf7bedc429a6ff62709af9d5acd

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