Merge non-fast-forward for release branch merges

James Moger

2014-06-16 9186c6413e7cdfc33527ca69d2e56dfec6d8b760

 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;

/**