Merge branch 'ticket/187' into develop

James Moger

2014-09-25 219722e27a5832b33d2fad7cd5649015ea3523a8

 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;