Merge branch 'master' into develop

James Moger

2014-05-07 0fbf8052cc0c6272baf64d8de2d07d2cdbf3a287

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