Merge branch 'master' into rpc

James Moger

2011-10-10 51e21e040c65781cea10b54365e87fa8e0459737

 src/com/gitblit/GitBlitServer.java

@@ -209,7 +209,7 @@


      // Root WebApp Context

      WebAppContext rootContext = new WebAppContext();

      rootContext.setContextPath("/");

      rootContext.setContextPath(settings.getString(Keys.server.contextPath, "/"));

      rootContext.setServer(server);

      rootContext.setWar(location.toExternalForm());

      rootContext.setTempDirectory(tempDir);