Merge overrides in addition to merging the normal settings

James Moger

2014-03-17 08704c63e1c5d8a089d0dba58c5fa3ba119a32a7

 src/main/java/com/gitblit/IStoredSettings.java

@@ -359,5 +359,6 @@
    */

   public void merge(IStoredSettings settings) {

      getSettings().putAll(settings.getSettings());

      overrides.putAll(settings.overrides);

   }

}