summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2008-12-23 17:22:57 -0500
committerJoey Hess <joey@gnu.kitenet.net>2008-12-23 17:22:57 -0500
commit70dc0355bd547158ae29381f77eb6d809e0fefaa (patch)
tree64158c0a3a207ea85cc3e4b6bbca441827ee38cc
parent149fbf97d6ed230cc14de38fd8ca145bd39d64b4 (diff)
parentf65311bddb82133e51ab504220dac2b839a2b535 (diff)
Merge branch 'master' into next
Conflicts: IkiWiki.pm
-rw-r--r--debian/changelog1
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index ce3949436..2c8931735 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
ikiwiki (2.72) UNRELEASED; urgency=low
* Avoid comments in recentchanges being broken links (smcv)
+ * Add deprecation warning for GlobLists, which will stop working in 3.0.
-- Joey Hess <joeyh@debian.org> Mon, 22 Dec 2008 19:02:16 -0500