Merge branch 'master' into next
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 23 Dec 2008 22:22:57 +0000 (17:22 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 23 Dec 2008 22:22:57 +0000 (17:22 -0500)
Conflicts:

IkiWiki.pm

debian/changelog

index ce3949436dbc9a04947acfc744e7435844fad7b2..2c8931735b78b1561d723b4718b96fede3e3a1f6 100644 (file)
@@ -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