Merge overrides in addition to merging the normal settings

James Moger

2014-03-17 08704c63e1c5d8a089d0dba58c5fa3ba119a32a7

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

@@ -137,7 +137,7 @@
   }

   @Override
   public IRuntimeManager setup() {
   public IRuntimeManager start() {
      return this;
   }
}