Merge branch 'ticket/63' into develop

diff --cc releases.moxie
index 62a71c6e306b9aedf61d7e1211da0ba078a3ffe8,2a36ac6eab6e505e71df4b18939f922a6bcf28c2..c750cbaab168e22a41c6fe0144b2e8bcbed24d50
--- 1/releases.moxie
--- 2/releases.moxie
+++ b/releases.moxie
@@@ -16,14 -16,14 +16,15 @@@ r23: 
      - Fix forcing default locale to en or LANG_CC for web ui (ticket-51)
      - Fix inconsistency with repository ownership permission checking (ticket-52)
      - Prevent submission from New|Edit ticket page with empty titles (ticket-53)
+     - Fix transport determination for SSH urls served on port 22 (issue-421, ticket-63)
      changes:
      - improve French translation (pr-176)
 -    - simplify current plugin release detection and ignore the currentRelease registry field 
 -    additions:
 -    - added TortoiseGit client app menu (pr-182)
 +    - simplify current plugin release detection and ignore the currentRelease registry field
 +    - split pages servlet into two servlets (issue-413)
 +    additions: ~
      dependencyChanges:
      - update to Apache MINA/SSHD 0.11.0 (issue-410)
 +    - added Apache Tiki 1.5 (issue-413)
      contributors:
      - James Moger
      - Julien Kirch

diff --cc src/main/java/com/gitblit/Constants.java
Simple merge