From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Apr 2010 20:43:44 +0000 (-0400)
Subject: Merge branch 'master' into templatemove
X-Git-Tag: 3.20100427~38
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/7bba52254569047ef1d9f5752096f155b0a2be77

Merge branch 'master' into templatemove

Conflicts:
	doc/templates.mdwn
---

7bba52254569047ef1d9f5752096f155b0a2be77