From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 25 Dec 2008 21:36:16 +0000 (-0500)
Subject: Merge branch 'master' into next
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/914c839ceb02fdbb36a49aa6548dc95beaf59ea4

Merge branch 'master' into next

Conflicts:

	IkiWiki/Plugin/googlecalendar.pm
---

914c839ceb02fdbb36a49aa6548dc95beaf59ea4
diff --cc debian/changelog
index ff1c6aa5f,19b8cbdf7..62ff1ba6f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -17,8 -2,10 +17,10 @@@ ikiwiki (2.72) unstable; urgency=lo
  
    * Avoid comments in recentchanges being broken links (smcv)
    * Add deprecation warning for GlobLists, which will stop working in 3.0.
+   * camelcase: Add camelcase_ignore setting.
+   * googlecalendar: Add runtime deprecation warning.
  
 - -- Joey Hess <joeyh@debian.org>  Mon, 22 Dec 2008 19:02:16 -0500
 + -- Joey Hess <joeyh@debian.org>  Wed, 24 Dec 2008 19:49:32 -0500
  
  ikiwiki (2.71) unstable; urgency=low