summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorAmitai Schlair <schmonz@magnetic-babysitter.(none)>2009-09-03 19:24:42 -0500
committerAmitai Schlair <schmonz@magnetic-babysitter.(none)>2009-09-03 19:24:42 -0500
commit1888464a0d9de9cf4ac40c298924018437758aa2 (patch)
treeb55aedb4983dd142e966ade8e270fd1d33fc2834 /debian
parent85844b8494dd5e032d06afd623c25b4bb4a72578 (diff)
parentf582457ea04a6ce66a2c54ec0731e2569aa30d3f (diff)
Merge branch 'master' of git://github.com/joeyh/ikiwiki
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog9
1 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index ee8e74027..6109a7012 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (3.14159265) UNRELEASED; urgency=low
+
+ * Add French basewiki translation from the Debian French l10n team,
+ including Philippe Batailler, Alexandre Dupas, and Steve Petruzzello.
+
+ -- Joey Hess <joeyh@debian.org> Wed, 02 Sep 2009 15:01:27 -0400
+
ikiwiki (3.1415926) unstable; urgency=high
[ Joey Hess ]
@@ -43,7 +50,7 @@ ikiwiki (3.1415926) unstable; urgency=high
[ Josh Triplett ]
* teximg: Replace the insufficient blacklist with the built-in security
- mechanisms of TeX.
+ mechanisms of TeX. (CVE-2009-2944)
-- Joey Hess <joeyh@debian.org> Sun, 30 Aug 2009 15:20:46 -0400