Merge branch 'master' into next

Conflicts:

	debian/changelog
	po/ikiwiki.pot

4 files changed, 11 insertions, 19 deletions

diff --git a/debian/changelog b/debian/changelog
index 2a872bb0e..66db70288 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,7 +26,7 @@ ikiwiki (2.72) unstable; urgency=low
   * inline: Run format hook first, to ensure other format hooks can affect
     inlined content.  Closes: #509710
 
- -- Joey Hess <joeyh@debian.org>  Wed, 24 Dec 2008 19:49:32 -0500
+ -- Joey Hess <joeyh@debian.org>  Sun, 28 Dec 2008 15:01:02 -0500
 
 ikiwiki (2.71) unstable; urgency=low
 
diff --git a/doc/news/version_2.67.mdwn b/doc/news/version_2.67.mdwn
deleted file mode 100644
index a0911b58f..000000000
--- a/doc/news/version_2.67.mdwn
+++ /dev/null
@@ -1,17 +0,0 @@
-ikiwiki 2.67 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * remove: Avoid $\_ breakage. (Stupid, stupid perl.)
-   * Updated Spanish translation from Victor Moral.
-   * lockedit: Support specifying which users (and IP addresses) a page
-     is locked for. This supports most of the ACL type things users have been
-     wanting to be done. Closes: #[443346](http://bugs.debian.org/443346) (It does not control who can read a
-     page, but that's out of scope for ikiwiki.)
-   * orphans: Fix unquoted page name in regexp.
-   * google: Plugin provides google site search, contributed by Peter Simons.
-   * Pass HTTPS variable through the wrapper so that CGI-&gt;https can be used
-     by plugins. Closes: #[502047](http://bugs.debian.org/502047)
-   * inline: Allow MTIME to be used in inlinepage.tmpl.
-   * inline: Use the feed's description in the rss and atom links.
-     Closes: #[502113](http://bugs.debian.org/502113)
-   * aggregate: Avoid bug that caused immediate expiration of items
-     with a date in the future."""]]
\ No newline at end of file
diff --git a/doc/news/version_2.72.mdwn b/doc/news/version_2.72.mdwn
new file mode 100644
index 000000000..26274a3c8
--- /dev/null
+++ b/doc/news/version_2.72.mdwn
@@ -0,0 +1,9 @@
+ikiwiki 2.72 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * 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.
+   * comments: Deal with users entering unqualified or partial urls.
+   * inline: Run format hook first, to ensure other format hooks can affect
+     inlined content.  Closes: #[509710](http://bugs.debian.org/509710)"""]]
\ No newline at end of file
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index bfbaaf0fa..7f664d111 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-26 21:41-0500\n"
+"POT-Creation-Date: 2008-12-28 15:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"