diff options
| author | intrigeri <intrigeri@boum.org> | 2009-01-18 00:38:31 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2009-01-18 00:38:31 +0100 |
| commit | e9e75f5f29d78b0631f98d9b0fa93184fcb181fe (patch) | |
| tree | 32b149ff7fa15747d90b9d20ca0296d4006221cc /debian | |
| parent | 832d4d31d177d5d5f848250496048a00e9d70e2f (diff) | |
| parent | f0c3cc0363ce6da4c3f239decc9fe0e5ed8d624b (diff) | |
| download | ikiwiki-e9e75f5f29d78b0631f98d9b0fa93184fcb181fe.tar ikiwiki-e9e75f5f29d78b0631f98d9b0fa93184fcb181fe.tar.gz | |
Merge commit 'upstream/master' into prv/po
Conflicts:
t/syntax.t
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 6384c8df9..013dc1884 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.02) UNRELEASED; urgency=low +ikiwiki (3.02) unstable; urgency=low * blogspam: New plugin, adding spam filtering for page editing / comment posting using the BlogSpam.net API. @@ -23,7 +23,7 @@ ikiwiki (3.02) UNRELEASED; urgency=low * Recommend libterm-readline-gnu-perl since that makes auto.setup behave better. - -- Joey Hess <joeyh@debian.org> Tue, 06 Jan 2009 15:02:52 -0500 + -- Joey Hess <joeyh@debian.org> Sat, 17 Jan 2009 18:19:39 -0500 ikiwiki (3.01) unstable; urgency=low |