From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 15 Jun 2008 19:05:15 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.51~87
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/c915ff6953f508454000767ad4ca3d0a0428b5bf

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

c915ff6953f508454000767ad4ca3d0a0428b5bf