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

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index f8de0d3e91b3b8cc2cdfdfd43206e8bee391d288..ccdeb8300d5c40f19bbbd0098e37be7b840492b0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+ikiwiki (3.20111108) UNRELEASED; urgency=low
+
+  * Consume all stdin when rcs_receive short-circuits, to avoid git SIPIPE race.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 05 Dec 2011 15:14:48 -0400
+
+ikiwiki (3.20111107) unstable; urgency=low
+
+  * img: Bugfix to width/height tags for scaled down image when only
+    one dimension was provided. Thanks, Per Carlson.
+  * editpage: Fix FormattingHelp link on Discussion pages.
+  * The umask setting can now be set to private, group, or public,
+    avoiding the need to enter octal correctly which is particularly
+    difficult in yaml setup files. (smcv)
+  * graphviz: Support urls embedded in the graph, by having graphviz
+    generate an imagemap.
+  * graphviz: Support wikilinks embedded in the graph.
+    (Sponsored by The TOVA Company.)
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 30 Nov 2011 16:31:48 -0400
+
 ikiwiki (3.20111106) unstable; urgency=low
 
   * searchquery.tmpl: Track escaping change in upstream template.