Merged #35 "Fix authentication security hole with external providers"

James Moger

2014-03-18 0145db444fdf75599de30cce2e3dbbc3f048d632

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

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

   public void merge(IStoredSettings settings) {

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

      overrides.putAll(settings.overrides);

   }

}