From: Joey Hess <joey@finch.kitenet.net>
Date: Tue, 11 May 2010 21:52:39 +0000 (+0000)
Subject: Merge branch 'master' of file:///srv/git/ikiwiki.info
X-Git-Tag: 3.20100515~33
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/688c58ac9080362e9f033bc6cc50d4b2d7d46d6f

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

688c58ac9080362e9f033bc6cc50d4b2d7d46d6f