From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 16:42:38 +0000 (-0400)
Subject: Merge branch 'master' into commentreorg
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/3adb47ec4f7374128d18a88cff54269104fc21fe?hp=3adb47ec4f7374128d18a88cff54269104fc21fe

Merge branch 'master' into commentreorg

Conflicts:
	debian/changelog
---