Merge branch 'ticket/154' into develop

James Moger

2014-09-04 248b7172cd23ac5853747c7c77e07ea8afded899

 src/test/java/com/gitblit/tests/mock/MemorySettings.java

@@ -48,6 +48,11 @@
   }

   @Override
   public boolean saveSettings() {
      return false;
   }

   @Override
   public boolean saveSettings(Map<String, String> updatedSettings) {
      return false;
   }