From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 4 Sep 2009 21:16:28 +0000 (-0400)
Subject: Merge commit 'schmonz/master' into cvs
X-Git-Tag: 3.14159265~76
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/8c55424b11edbe1fd3e6ff1e20ec85c1f3c6e593?hp=8c55424b11edbe1fd3e6ff1e20ec85c1f3c6e593

Merge commit 'schmonz/master' into cvs

Conflicts:
	IkiWiki/Plugin/cvs.pm
---