Merge branch 'master' into develop

James Moger

2014-05-07 0fbf8052cc0c6272baf64d8de2d07d2cdbf3a287

 src/main/java/com/gitblit/dagger/DaggerContext.java

@@ -61,7 +61,7 @@
   @Override
   public final void contextDestroyed(ServletContextEvent contextEvent) {
      ServletContext context = contextEvent.getServletContext();
      context.setAttribute(INJECTOR_NAME, null);
      context.removeAttribute(INJECTOR_NAME);
      destroyContext(context);
   }
}