From a206c9ee6e09214fe6bc1c1386ef8aa6808b7c89 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Fri, 16 Nov 2012 10:35:33 +0100
Subject: Adjust git-log-fix for cherry-picked commits.

--
---
 scripts/git-log-fix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/git-log-fix b/scripts/git-log-fix
index 6760e8632..2879d9206 100644
--- a/scripts/git-log-fix
+++ b/scripts/git-log-fix
@@ -2,9 +2,9 @@
 # option.  It specifies what changes to make to each given SHA1's commit
 # log and metadata, using Perl-eval'able expressions.
 
-08178d1e130a856622c0b938a34eb109bde79262
+8dff0096132fff70a5ee29a50222aebcd9b41ec7
 s/Conflicts:/--/
 
-dafa7aa621dfe36c5c6cf462d3ec0d6c614ab105
+d9d98c510b936d48755f8c01165d7efa32502d24
 # Fix old cherry-picked message.
 s/(fix wLangId in.*)/\1\n--/
-- 
cgit v1.2.3