From 22a9488e3ce4d9b5df4fab513d633e701a91de5a Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 13 Aug 2012 16:29:02 -0400
Subject: [PATCH] Merge branch 'master' of https://github.com/Mrbytes/gitblit

---
 src/com/gitblit/wicket/GitBlitWebApp.properties |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/com/gitblit/wicket/GitBlitWebApp.properties b/src/com/gitblit/wicket/GitBlitWebApp.properties
index bcd6337..f9480a8 100644
--- a/src/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/com/gitblit/wicket/GitBlitWebApp.properties
@@ -312,4 +312,5 @@
 gb.duration.years = {0} years
 gb.authorizationControl = authorization control
 gb.allowAuthenticatedDescription = grant restricted access to all authenticated users
-gb.allowNamedDescription = grant restricted access to named users or teams
\ No newline at end of file
+gb.allowNamedDescription = grant restricted access to named users or teams
+gb.markdownFailure = Failed to parse Markdown content!
\ No newline at end of file

--
Gitblit v1.9.1