Merge branch 'ticket/135' into develop

James Moger

2014-09-26 aaa4e8f82711fe228500393b1a3dd5f3f0d78911

 src/main/java/com/gitblit/servlet/PtServlet.java

@@ -21,8 +21,8 @@
import java.io.InputStream;

import java.io.OutputStream;



import javax.inject.Inject;

import javax.inject.Singleton;

import com.google.inject.Inject;

import com.google.inject.Singleton;

import javax.servlet.ServletException;

import javax.servlet.http.HttpServlet;

import javax.servlet.http.HttpServletRequest;