Merge branch 'ticket/167' into develop

James Moger

2014-09-05 b8a44784ba8b0aaf9a3fbe6321956c0ee0e0451c

 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;