From 8ba4e907c7add3a7225651934f0c127c753203ec Mon Sep 17 00:00:00 2001
From: Nate Coraor <nate@bx.psu.edu>
Date: Fri, 12 Dec 2014 16:00:13 -0500
Subject: [PATCH 1/4] Update tag latest_2014.10.06 for changeset db9561875903

---
 .hgtags | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.hgtags b/.hgtags
index 97a70c92293..66b09122943 100644
--- a/.hgtags
+++ b/.hgtags
@@ -20,4 +20,4 @@ a4113cc1cb5eaa68091c9a73375f00555b66dd11 release_2013.01.13
 ca45b78adb4152fc6e7395514d46eba6b7d0b838 release_2014.08.11
 548ab24667d6206780237bd807f7d857a484c461 latest_2014.08.11
 2092948937ac30ef82f71463a235c66d34987088 release_2014.10.06
-e416697be38e66f18be89a4cfca70457c9784294 latest_2014.10.06
+db9561875903e76ce678ccc3d3df057e311edffa latest_2014.10.06

From 095e41752eb6ba4844eb5054f11ddf1162db6b15 Mon Sep 17 00:00:00 2001
From: Daniel Blankenberg <dan@bx.psu.edu>
Date: Mon, 15 Dec 2014 17:01:07 -0500
Subject: [PATCH 2/4] Do not |h escape tool dependency error message, as it is
 escaped and formated by tool_shed.util.basic_util.to_html_string

---
 .../manage_repository_tool_dependencies.mako                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/admin/tool_shed_repository/manage_repository_tool_dependencies.mako b/templates/admin/tool_shed_repository/manage_repository_tool_dependencies.mako
index 0a37b6fe65c..babb9ce6074 100644
--- a/templates/admin/tool_shed_repository/manage_repository_tool_dependencies.mako
+++ b/templates/admin/tool_shed_repository/manage_repository_tool_dependencies.mako
@@ -57,7 +57,7 @@ ${render_galaxy_repository_actions( repository )}
                     <td>${tool_dependency.version|h}</td>
                     <td>${tool_dependency.type|h}</td>
                     <td>${tool_dependency.status|h}</td>
-                    <td>${error_message|h}</td>
+                    <td>${error_message}</td>
                 </tr>
             %endfor
         </table>

From 75da622efee0a9fe38d6271e91ee0ca1778ecbee Mon Sep 17 00:00:00 2001
From: Nate Coraor <nate@bx.psu.edu>
Date: Tue, 16 Dec 2014 09:00:19 -0500
Subject: [PATCH 3/4] Update tag latest_2014.10.06 for changeset 7086b87d83a9

---
 .hgtags | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.hgtags b/.hgtags
index 66b09122943..22ac92bb8d0 100644
--- a/.hgtags
+++ b/.hgtags
@@ -20,4 +20,4 @@ a4113cc1cb5eaa68091c9a73375f00555b66dd11 release_2013.01.13
 ca45b78adb4152fc6e7395514d46eba6b7d0b838 release_2014.08.11
 548ab24667d6206780237bd807f7d857a484c461 latest_2014.08.11
 2092948937ac30ef82f71463a235c66d34987088 release_2014.10.06
-db9561875903e76ce678ccc3d3df057e311edffa latest_2014.10.06
+7086b87d83a9092cbece0fec6f3e3ed03266be0c latest_2014.10.06

From 24012f7d65216831a31db73a95c42d2f0269a6d7 Mon Sep 17 00:00:00 2001
From: Dave Bouvier <dave@bx.psu.edu>
Date: Tue, 16 Dec 2014 15:00:50 -0500
Subject: [PATCH 4/4] Reduce minimum length of repository names from 4
 characters to 2.

---
 lib/tool_shed/util/repository_util.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/tool_shed/util/repository_util.py b/lib/tool_shed/util/repository_util.py
index 8af826321a0..8ee97941840 100644
--- a/lib/tool_shed/util/repository_util.py
+++ b/lib/tool_shed/util/repository_util.py
@@ -322,8 +322,8 @@ def validate_repository_name( app, name, user ):
             return 'You have a deleted repository named <b>%s</b>, so choose a different name.' % name
         else:
             return "You already have a repository named <b>%s</b>, so choose a different name." % name
-    if len( name ) < 4:
-        return "Repository names must be at least 4 characters in length."
+    if len( name ) < 2:
+        return "Repository names must be at least 2 characters in length."
     if len( name ) > 80:
         return "Repository names cannot be more than 80 characters in length."
     if not( VALID_REPOSITORYNAME_RE.match( name ) ):