Merge commit 'upstream/master' into prv/po

Conflicts:

	debian/control
	debian/copyright
	doc/ikiwiki/pagespec.mdwn

Signed-off-by: intrigeri <intrigeri@boum.org>

1 files changed, 43 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index dd19c1463..7875d425b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,46 @@
+ikiwiki (2.72) unstable; urgency=low
+
+  * 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
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 28 Dec 2008 15:01:02 -0500
+
+ikiwiki (2.71) unstable; urgency=low
+
+  * comments: Blog-style comment support, contributed by Simon McVittie.
+  * htmlbalance: New plugin contributed by Simon McVittie.
+  * Change deb dependencies to list Text::Markdown before markdown (really
+    this time).
+  * Improve escaping of wikilinks and preprocessor directives in content
+    produced by aggregate and recentchanges.
+  * French translation update from Philippe Batailler. Closes: #506250
+  * Spanish translation update from Victor Moral.
+  * Fix handling of wrappergroup option.
+  * Correct --dumpsetup to include the srcdir in the setup file.
+  * German translation update from Kai Wasserbäch. Closes: #507056
+  * inline: Support emptyfeeds=no option to skip generating empty feeds.
+  * inline: Support feedfile option to change the filename of the feed
+    generated.
+  * meta: Pass info to htmlscrubber so htmlscrubber_skip can take effect.
+  * htmlbalance: don't compact whitespace, and set misc other options (smcv)
+  * rename: Fix double-escaping of page name in edit box.
+  * monotone: When getting the log, tell monotone how many entries
+    we want, rather than closing the pipe, which it dislikes. (thm)
+  * Coding style change: Remove explcit vim folding markers.
+  * aggregate: If a feed fails to be downloaded, try again immediatly
+    next time aggregation is run, even if the usual time has not passed.
+    Closes: #508622 (Michael Gold)
+  * meta: Process meta date during scan pass so that the date will always
+    affect sorting in inlines.
+  * Improve display of some openids (smcv)
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 21 Dec 2008 16:22:05 -0500
+
 ikiwiki (2.70) unstable; urgency=low
 
   * Avoid crash on malformed utf-8 discovered by intrigeri.