Merge branch 'ticket/203' into develop

James Moger

2014-10-07 c41962cda64d0cac37d4053c2120482b299dc7bd

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