Merge branch 'master' into develop

James Moger

2014-05-07 0fbf8052cc0c6272baf64d8de2d07d2cdbf3a287

 src/main/java/com/gitblit/models/ServerSettings.java

@@ -58,4 +58,8 @@
   public boolean hasKey(String key) {

      return settings.containsKey(key);

   }



   public SettingModel remove(String key) {

      return settings.remove(key);

   }

}