From: Joey Hess <joey@kitenet.net>
Date: Fri, 10 Jun 2011 22:48:22 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20110707~81
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/d86f248329b1702c5093e0bd8274c3bd3f059ba8

Merge branch 'master' of ssh://git.ikiwiki.info
---

d86f248329b1702c5093e0bd8274c3bd3f059ba8