Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[www/ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index e1f9fbe623d0fe9a64ff9390ae08777c9324c798..e387af09561bdbd1fa7731addceb9610c9cc63c5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ikiwiki (2.47) UNRELEASED; urgency=low
+
+  * mdwn: Add a multimarkdown setup file option.
+  * If PERL5LIB is set to the libdir when building ikiwiki, calculate and 
+    hardcode a proper 'use lib' statement anyway. This fixes a gotcha,
+    since PERL5LIB won't work once ikiwiki is running via a wrapper or as
+    a cgi.
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 13 May 2008 12:30:18 -0400
+
 ikiwiki (2.46) unstable; urgency=low
 
   * amazon_s3: New plugin, which injects wiki pages into Amazon S3, allowing