From: Joey Hess <joey@kitenet.net>
Date: Sat, 24 Apr 2010 04:46:17 +0000 (-0400)
Subject: Merge branch 'master' into templatemove
X-Git-Tag: 3.20100427~28
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/8a56df576a9d7d184a5233bcde8ea07eee86dd60

Merge branch 'master' into templatemove
---

8a56df576a9d7d184a5233bcde8ea07eee86dd60