Merge branch 'master' into develop

James Moger

2014-05-07 0fbf8052cc0c6272baf64d8de2d07d2cdbf3a287

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