From 337e2a0406d56b0b05012eb8e3bc1a393502f714 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 07 May 2014 09:28:20 -0400
Subject: [PATCH] Merge branch 'ticket/63' into develop

---
 releases.moxie |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/releases.moxie b/releases.moxie
index 3de602d..c750cba 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -9,14 +9,31 @@
     html: ~
     text: ~
     security: ~
-    fixes: ~
-    changes: ~
+    fixes:
+    - Fix subdirectory links in pages servlet (issue-411)
+    - Fix subdirectory navigation in pages servlet (issue-412)
+    - Fix bug in adding invalid or empty SSH keys (ticket-50)
+    - 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
+    - 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
     - Ralph Hoffman
+    - Olivier Rouits
+    - Owen Nelson
+    - Alexander Zabluda
+    - Philipp Beckmann
+    - Jakob Boysen
 }
 
 #

--
Gitblit v1.9.1