Merge branch 'ticket/115' into develop

James Moger

2014-06-27 5b41f21c57274c4f2e58b78dcb8666d0b37dc6d2

 src/main/java/com/gitblit/wicket/pages/UserPage.html

@@ -64,7 +64,9 @@
      <form wicket:id="prefsForm">

         <div wicket:id="displayName"></div>

         <div wicket:id="emailAddress"></div>

         <div wicket:id="language"></div>	
         <div wicket:id="emailMeOnMyTicketChanges"></div>

         <div wicket:id="language"></div>

         <div wicket:id="transport"></div>

         

         <div class="form-actions"><input class="btn btn-appmenu" type="submit" value="Save" wicket:message="value:gb.save" wicket:id="save" /></div>

      </form>