Merge non-fast-forward for release branch merges

James Moger

2014-06-16 9186c6413e7cdfc33527ca69d2e56dfec6d8b760

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

@@ -82,6 +82,21 @@
   }

   @Override
   public boolean isServingHTTP() {
      return true;
   }

   @Override
   public boolean isServingGIT() {
      return true;
   }

   @Override
   public boolean isServingSSH() {
      return true;
   }

   @Override
   public boolean isDebugMode() {
      return true;
   }