Merge branch 'master' into next

Conflicts:

	IkiWiki.pm
master
Joey Hess 2008-12-23 17:22:57 -05:00
commit 70dc0355bd
1 changed files with 1 additions and 0 deletions

1
debian/changelog vendored
View 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