From: Joey Hess <joey@kitenet.net>
Date: Tue, 20 Apr 2010 22:19:00 +0000 (-0400)
Subject: Merge branch 'master' into autotag
X-Git-Tag: 3.20100427~62^2~17
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/34e8c78c1c9bf65564c1a3086584158e5c3cc415

Merge branch 'master' into autotag
---

34e8c78c1c9bf65564c1a3086584158e5c3cc415