Merge branch 'ticket/196' into develop

James Moger

2014-09-30 2654d99368054b7f8cfaec056b599cac4cfb53d9

 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;