Merge branch 'ticket/153' into develop

James Moger

2014-09-04 5a4ac53238de477ff866b1f05b774ff714bcd71d

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