Merge branch 'ticket/118' into develop

James Moger

2014-06-27 9b89bf102d1fb2cb96ce96eec746a594e539125c

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

@@ -98,6 +98,10 @@
      }

   }



   protected String getContextUrl() {

      return getRequest().getRelativePathPrefixToContextRoot();

   }



   protected String getCanonicalUrl() {

      return getCanonicalUrl(getClass(), getPageParameters());

   }