From: Joey Hess <joey@kitenet.net>
Date: Fri, 5 Sep 2008 16:38:19 +0000 (-0400)
Subject: Merge branch 'master' of file:///srv/git/ikiwiki.info
X-Git-Tag: 2.63~9
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/e79e3143509d3f4c0273e8eed5956d264cbc56e2

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

e79e3143509d3f4c0273e8eed5956d264cbc56e2