Merge branch 'master' of ssh://git.ikiwiki.info

[git.ikiwiki.info.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index dbc9b16a555f89b1eb29bd2a6dc650ceca9e2616..2d9ffdb858177b3ad3269e3e4f5f7ac1d7a3e72e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,23 @@
-ikiwiki (3.20120116) UNRELEASED; urgency=low
+ikiwiki (3.20120203) UNRELEASED; urgency=low
+
+  * Fix a snail mail address. Closes: #659158
+  * openid-jquery.js: Update URL of Wordpress favicon. Closes: #660549
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 08 Feb 2012 16:07:00 -0400
+
+ikiwiki (3.20120202) unstable; urgency=low

 
   * mdwn: Added nodiscount setting, which can be used to avoid using the
     markdown discount engine, when maximum compatability is needed.
   * Switch to YAML::XS to work around insanity in YAML::Mo. Closes: #657533
 
   * mdwn: Added nodiscount setting, which can be used to avoid using the
     markdown discount engine, when maximum compatability is needed.
   * Switch to YAML::XS to work around insanity in YAML::Mo. Closes: #657533

-
- -- Joey Hess <joeyh@debian.org>  Mon, 16 Jan 2012 13:41:14 -0400
+  * cvs: Ensure text files are added in non-binary mode. (Amitai Schlair)
+  * cvs: Various cleanups and testing. (Amitai Schlair)
+  * calendar: Fix strftime encoding bug.
+  * shortcuts: Fixed a broken shortcut to wikipedia (accidentially
+    made into a shortcut to wikiMedia).
+  * Various portability improvements. (Amitai Schlair)
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 02 Feb 2012 21:42:40 -0400

 
 ikiwiki (3.20120115) unstable; urgency=low
 
 
 ikiwiki (3.20120115) unstable; urgency=low