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

Merge branch 'master' into autotag
---

318134174f62a598ae77e2e50f53518fbd673a19