Merge branch 'ticket/121' into develop

James Moger

2014-07-01 08b991702febefc8682bbca60fe813df8e29d8cb

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