Merged #36 "Fix missing subject in html mailings"

James Moger

2014-03-21 d23a1ce6ebe1b348fe21aefd5402f562609151fd

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

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

   public void merge(IStoredSettings settings) {

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

      overrides.putAll(settings.overrides);

   }

}