Merge release 1.6.0

James Moger

2014-06-16 111b48c40cd2cc4e19e28c8b6af8379885fb617b

 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;