Merge remote branch 'origin/debian-testing' into debian-testing

diff --git a/debian/changelog b/debian/changelog
index 2502e1a5481822504018693e2f0533e36e5801c8..734e2471d38d2da38bc46ee0030aaf3a7ea69a74 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20100815.3) testing; urgency=low
+ikiwiki (3.20100815.4) testing; urgency=low
 
   * meta: Fix calling of htmlscrubber to pass the page parameter.
     The change of the htmlscrubber to look at page rather than destpage