Merge branch 'ticket/199' into develop

James Moger

2014-09-30 5759941c21e106c864a672ec4e5e4b10fa2310ed

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

@@ -18,8 +18,8 @@
import java.io.File;

import java.io.IOException;



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;