From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 9 Oct 2008 23:14:55 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.67~46
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/f3bfa1a79763c5dad1ca415c902ea51b6bccce83?hp=f3bfa1a79763c5dad1ca415c902ea51b6bccce83

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