Merge overrides in addition to merging the normal settings

James Moger

2014-03-17 08704c63e1c5d8a089d0dba58c5fa3ba119a32a7

 src/test/java/de/akquinet/devops/GitblitRunnable.java

@@ -18,7 +18,6 @@
import java.net.InetAddress;
import java.net.ServerSocket;

import com.gitblit.GitBlitServer;
import com.gitblit.tests.GitBlitSuite;

/**