Merge branch 'master' into develop

James Moger

2014-05-07 0fbf8052cc0c6272baf64d8de2d07d2cdbf3a287

 src/main/java/com/gitblit/wicket/pages/BlobDiffPage.java

@@ -80,7 +80,7 @@
   protected String getPageName() {

      return getString("gb.diff");

   }

	


   @Override

   protected Class<? extends BasePage> getRepoNavPageClass() {

      return TreePage.class;