Merge branch 'ticket/221' into develop

James Moger

2014-11-10 8cd4feca58b55f311a543c744777e930c4f4b34a

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

@@ -20,8 +20,8 @@
import java.text.ParseException;

import java.util.Date;



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.HttpServletResponse;