Merge overrides in addition to merging the normal settings

James Moger

2014-03-17 08704c63e1c5d8a089d0dba58c5fa3ba119a32a7

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