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

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

diff --git a/debian/changelog b/debian/changelog
index 8c1c685be33f540a15627907dc1e44de3dc9256e..8d7618753d96f2bf8fd28930dd08e65d819fd916 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,12 @@
-ikiwiki (3.20120630) UNRELEASED; urgency=low
+ikiwiki (3.20120726) UNRELEASED; urgency=low
+
+  * monochrome: New theme, contributed by Jon Dowland.
+  * rst: Ported to python 3, while still also being valid python 2.
+    Thanks, W. Trevor King
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 30 Aug 2012 11:56:12 -0400
+
+ikiwiki (3.20120725) unstable; urgency=low

 
   * recentchangesdiff: When diffurl is not set, provide inline diffs
     in the recentchanges page, with visibility toggleable via javascript.
 
   * recentchangesdiff: When diffurl is not set, provide inline diffs
     in the recentchanges page, with visibility toggleable via javascript.


@@ -12,7 +20,7 @@ ikiwiki (3.20120630) UNRELEASED; urgency=low
     Thanks, Antoine Beaupré
   * comments: Remove ipv6 address specific code.
 
     Thanks, Antoine Beaupré
   * comments: Remove ipv6 address specific code.
 

- -- Joey Hess <joeyh@debian.org>  Thu, 19 Jul 2012 13:46:52 -0400
+ -- Joey Hess <joeyh@debian.org>  Sat, 25 Aug 2012 10:58:42 -0400

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