Merge branch 'debian-testing'

Conflicts:
	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 121cf83817429375245a461b59a986b71954e6d8..b9b08050b61f8293fcb7570a2e246ecb5cf0f1df 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,7 +13,7 @@ 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
 

diff --git a/doc/news/version_3.20100815.mdwn b/doc/news/version_3.20100815.mdwn
new file mode 100644 (file)
index 0000000..1073933
--- /dev/null
+++ b/doc/news/version_3.20100815.mdwn
@@ -0,0 +1,4 @@
+ikiwiki 3.20100815 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Fix po test suite to not assume ikiwiki's underlay is already installed.
+     Closes: #[593047](http://bugs.debian.org/593047)"""]]
\ No newline at end of file

diff --git a/ikiwiki.spec b/ikiwiki.spec
index 99de59fb87a5fd3bb185d07a59a9387219821a86..9250a67cfa3402d3b111cc8ed1d97fd3cf8e13bd 100644 (file)
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version: 3.20100804
+Version: 3.20100815
 Release:        1%{?dist}
 Summary:        A wiki compiler
 

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 9d311a5ada84d77dfcfcd3d3de32e0eb896f8205..a8226f4029ffe97dbd26f7c04a7382c48c5400cc 100644 (file)
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-04 09:22-0400\n"
+"POT-Creation-Date: 2010-08-15 11:48-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"