From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 29 Aug 2008 17:21:25 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.63~50
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/494b36acd6b23502be9c907b2d3f7121c8f1576b

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

494b36acd6b23502be9c907b2d3f7121c8f1576b