From 3962eca81dc86d8bb857d69b491fcf2f626d3268 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Wed, 11 Jan 2017 23:03:33 +0000
Subject: [PATCH] Update changelog for latest backport

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4d6b03dc9..2d0134c49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -47,6 +47,12 @@ ikiwiki (3.20120629.2+deb7u2) UNRELEASED; urgency=medium
   * Split CFLAGS into words when building wrapper, fixing build-time test
     failure. Closes: #682237 (patch from Joey Hess, backported from
     3.20120630)
+  * In the CGI wrapper, incorporate $config{ENV} into the environment
+    before executing Perl code, so that PERL5LIB can point to a
+    non-system-wide installation of IkiWiki. Some build-time tests rely
+    on this, in particular t/git-cgi.t.
+    (patch from Lafayette Chamber Singers Webmaster, backported from
+    3.20140916)
 
  -- Simon McVittie <smcv@debian.org>  Wed, 11 Jan 2017 15:22:38 +0000
 
-- 
2.39.2