# HG changeset patch
# User Kevin Bullock <kbullock@ringworld.org>
# Date 1360406426 0
# Node ID 3af017bd8ef94c0f1a754d220917e6df47e042a0
# Parent  ef78450c8df6ae3792f7410a52e962bfcbc2c6bf# Parent  b27b17a5362a9cd4cdf311796017876e7a032bbb
merge crew heads

diff -r ef78450c8df6 -r 3af017bd8ef9 .hgsigs
--- a/.hgsigs	Fri Feb 08 23:49:14 2013 +0100
+++ b/.hgsigs	Sat Feb 09 10:40:26 2013 +0000
@@ -65,3 +65,4 @@
 a4765077b65e6ae29ba42bab7834717b5072d5ba 0 iD8DBQBQ486sywK+sNU5EO8RAhmJAJ90aLfLKZhmcZN7kqphigQJxiFOQACeJ5IUZxjGKH4xzi3MrgIcx9n+dB0=
 f5fbe15ca7449f2c9a3cf817c86d0ae68b307214 0 iD8DBQBQ+yuYywK+sNU5EO8RAm9JAJoD/UciWvpGeKBcpGtZJBFJVcL/HACghDXSgQ+xQDjB+6uGrdgAQsRR1Lg=
 a6088c05e43a8aee0472ca3a4f6f8d7dd914ebbf 0 iD8DBQBRDDROywK+sNU5EO8RAh75AJ9uJCGoCWnP0Lv/+XuYs4hvUl+sAgCcD36QgAnuw8IQXrvv684BAXAnHcA=
+7511d4df752e61fe7ae4f3682e0a0008573b0402 0 iD8DBQBRFYaoywK+sNU5EO8RAuErAJoDyhXn+lptU3+AevVdwAIeNFyR2gCdHzPHyWd+JDeWCUR+pSOBi8O2ppM=
diff -r ef78450c8df6 -r 3af017bd8ef9 .hgtags
--- a/.hgtags	Fri Feb 08 23:49:14 2013 +0100
+++ b/.hgtags	Sat Feb 09 10:40:26 2013 +0000
@@ -78,3 +78,4 @@
 a4765077b65e6ae29ba42bab7834717b5072d5ba 2.4.2
 f5fbe15ca7449f2c9a3cf817c86d0ae68b307214 2.5-rc
 a6088c05e43a8aee0472ca3a4f6f8d7dd914ebbf 2.5
+7511d4df752e61fe7ae4f3682e0a0008573b0402 2.5.1
diff -r ef78450c8df6 -r 3af017bd8ef9 i18n/de.po
--- a/i18n/de.po	Fri Feb 08 23:49:14 2013 +0100
+++ b/i18n/de.po	Sat Feb 09 10:40:26 2013 +0000
@@ -21,7 +21,7 @@
 "Project-Id-Version: Mercurial\n"
 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
 "POT-Creation-Date: 2012-09-01 14:20+0200\n"
-"PO-Revision-Date: 2012-09-10 09:39+0100\n"
+"PO-Revision-Date: 2013-02-05 22:00+0100\n"
 "Last-Translator: Martin Schröder <martinschroeder@vcp-sh.de>\n"
 "Language-Team: \n"
 "Language: de\n"
@@ -8105,7 +8105,7 @@
 msgstr ""
 "      j - Diese Änderung übernehmen\n"
 "      n - Diese Änderung überspringen\n"
-"      b - Diese Änderung manuell bearbeiten"
+"      e - Diese Änderung manuell bearbeiten"
 
 msgid ""
 "      s - skip remaining changes to this file\n"