Merge remote branch 'upstream/master' into prv/po

Conflicts:
	IkiWiki/Plugin/po.pm
	doc/plugins/po.mdwn

1 files changed, 25 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index 15ae21a55..c340f8901 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,16 @@
-ikiwiki (3.20100624) UNRELEASED; urgency=low
+ikiwiki (3.20100705) UNRELEASED; urgency=low
+
+  * img: Add a margin around images displayed by this directive.
+  * comments: Added commentmoderation directive for easy linking to the
+    comment moderation queue.
+  * aggregate: Write timestamp next aggregation can happen to
+    .ikiwiki/aggregatetime, to allow for more sophisticated cron jobs.
+  * Add --changesetup mode that allows easily changing options in a
+    setup file.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 05 Jul 2010 13:59:42 -0400
+
+ikiwiki (3.20100704) unstable; urgency=low
 
   * Changes to avoid display of ugly google openids, by displaying
     a username taken from openid.
@@ -14,8 +26,18 @@ ikiwiki (3.20100624) UNRELEASED; urgency=low
     (Make it relative like everything else.)
   * hnb: Fixed broken use of mkstemp that had caused dangling temp files,
     and prevented actually rendering hnb files.
-
- -- Joey Hess <joeyh@debian.org>  Wed, 23 Jun 2010 15:30:04 -0400
+  * Use comment template on comments page of example blog.
+  * comment.tmpl: Fix up display when inline uses it to display a non-comment
+    page. (Such as a discussion page.)
+  * git: Added git_wrapper_background_command option. Can be used to eg, 
+    make the git wrapper push to github in the background after ikiwiki
+    runs.
+  * po: Added needstranslation() pagespec. (intrigeri)
+  * po: Added support for .html source pages. (intrigeri)
+  * comment: Fix problem moderating comments of certian pages with utf-8
+    in their name.
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 04 Jul 2010 16:19:43 -0400
 
 ikiwiki (3.20100623) unstable; urgency=low