From 50380b329e69c0a9fa423475aee59a2c9633db69 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 27 Mar 2014 09:39:25 -0400
Subject: [PATCH] Replace JCommander with args4j

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

diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
index e52623e..2ab023f 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
@@ -668,4 +668,5 @@
 gb.repositoryIsFrozen = This repository is frozen.
 gb.repositoryDoesNotAcceptPatchsets = This repository does not accept patchsets.
 gb.serverDoesNotAcceptPatchsets = This server does not accept patchsets.
-gb.ticketIsClosed = This ticket is closed.
\ No newline at end of file
+gb.ticketIsClosed = This ticket is closed.
+gb.mergeToDescription = default integration branch for merging ticket patchsets

--
Gitblit v1.9.1