From 68ae0d32ea896155e5b611d10c1663b674c3a220 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 23 May 2014 08:31:13 -0400
Subject: [PATCH] Merge branch 'ticket/84' into develop

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

diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp_nl.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_nl.properties
index 37d62e5..c669f3f 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp_nl.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_nl.properties
@@ -669,3 +669,4 @@
 gb.repositoryDoesNotAcceptPatchsets = Deze repositorie accepteert geen patchsets.
 gb.serverDoesNotAcceptPatchsets = Deze server accepteert geen patchsets.
 gb.ticketIsClosed = Deze ticket is gesloten.
+gb.mergeToDescription = default integratie branch voor het mergen van ticket patchsets

--
Gitblit v1.9.1