Merge branch 'debian-testing'

Conflicts:
	debian/changelog

diff --combined debian/changelog
index 121cf83817429375245a461b59a986b71954e6d8,98d13376d138720bb030306243b69dbf9321e85b..b9b08050b61f8293fcb7570a2e246ecb5cf0f1df
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,9 +1,19 @@@
 +ikiwiki (3.20100816) UNRELEASED; urgency=low
 +
 +  * filecheck: Fall back to using the file command if the freedesktop
 +    magic file cannot identify a file.
 +  * flattr: New plugin. (Thanks to jaywalk for the initial implementation
 +    at a flattr plugin! This one is less configurable, but simpler.)
 +  * smiley: warn instead of error for missing smileys (Giuseppe Bilotta)
 +
 + -- Joey Hess <joeyh@debian.org>  Sun, 15 Aug 2010 11:45:48 -0400
 +
  ikiwiki (3.20100815) unstable; urgency=medium
  
    * Fix po test suite to not assume ikiwiki's underlay is already installed.
      Closes: #593047
  
-  -- Joey Hess <joeyh@debian.org>  Sun, 15 Aug 2010 11:45:40 -0400
+  -- Joey Hess <joeyh@debian.org>  Sun, 15 Aug 2010 11:42:55 -0400
  
  ikiwiki (3.20100804) unstable; urgency=low