Merge branch 'ticket/187' into develop

James Moger

2014-09-25 219722e27a5832b33d2fad7cd5649015ea3523a8

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