From: Joey Hess <joey@kitenet.net>
Date: Sat, 24 Apr 2010 04:47:54 +0000 (-0400)
Subject: Merge branch 'master' into templatemove
X-Git-Tag: 3.20100427~27
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/39d4bfde6b9c49f0a8b13699be701bda11eb851a?ds=sidebyside

Merge branch 'master' into templatemove
---

39d4bfde6b9c49f0a8b13699be701bda11eb851a