Merged #33 "Merge overrides in addition to merging the normal settings"

James Moger

2014-03-17 4ff1429245b3748372643251a92d71821f257ccf

 src/main/java/com/gitblit/manager/IManager.java

@@ -17,7 +17,8 @@

public interface IManager {

   IManager setup();
   IManager start();

   IManager stop();

}