Merge branch 'ticket/63' into develop

James Moger

2014-05-07 337e2a0406d56b0b05012eb8e3bc1a393502f714

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