Merge release 1.6.0

James Moger

2014-06-16 111b48c40cd2cc4e19e28c8b6af8379885fb617b

 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);

   }

}