Merge branch 'ticket/237' into develop

James Moger

2015-02-11 5ec94c4282ed3630b7b4cd0fb5db62c20ce46d9d

 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;