Merge pull request #929 from willyann/develop

James Moger

2015-09-30 7be48d8d14c74dfb10ba3d71f12a78505daf29a6

 src/main/java/com/gitblit/servlet/LogoServlet.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.ServletContext;

import javax.servlet.ServletException;

import javax.servlet.http.HttpServlet;