Merge branch 'master' into next

Conflicts:

	IkiWiki/Plugin/googlecalendar.pm

diff --cc IkiWiki/Plugin/camelcase.pm
Simple merge

diff --cc debian/changelog
index ff1c6aa5f70c3fe50c002c8da7da47809ddda54c,19b8cbdf7adaf0df3fa69803b9ca1f7ce53cf60e..62ff1ba6f92c42ee311263a6333d459bb8198190
--- 1/debian/changelog
--- 2/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