From: Joey Hess <joey@kitenet.net>
Date: Sun, 15 Aug 2010 16:01:16 +0000 (-0400)
Subject: Merge branch 'debian-testing'
X-Git-Tag: 3.20100831~72
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/91f5697025ce92e64ad9d02c122d6a8d6df22278?hp=-c

Merge branch 'debian-testing'

Conflicts:
	debian/changelog
---

91f5697025ce92e64ad9d02c122d6a8d6df22278
diff --combined debian/changelog
index 121cf8381,98d13376d..b9b08050b
--- a/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