Merge branch 'ticket/135' into develop

James Moger

2014-09-26 aaa4e8f82711fe228500393b1a3dd5f3f0d78911

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

@@ -15,8 +15,8 @@
 */

package com.gitblit.servlet;



import javax.inject.Inject;

import javax.inject.Singleton;

import com.google.inject.Inject;

import com.google.inject.Singleton;



import com.gitblit.manager.IAuthenticationManager;

import com.gitblit.manager.IRepositoryManager;