Merge release 1.6.0

James Moger

2014-06-16 111b48c40cd2cc4e19e28c8b6af8379885fb617b

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

@@ -64,8 +64,8 @@
      <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>