From: Joey Hess <joey@kitenet.net>
Date: Fri, 13 Aug 2010 21:59:51 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100831~78
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/fc5b26dd326932c6f3493983ad65f2783d6170e1

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

fc5b26dd326932c6f3493983ad65f2783d6170e1