Merge branch 'ticket/121' into develop

James Moger

2014-07-01 08b991702febefc8682bbca60fe813df8e29d8cb

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