From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 11 Nov 2008 00:49:37 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.69~13
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/1c4a4a41e1c96d0f486a7b039718dd5f35865af2?ds=sidebyside;hp=--cc

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

1c4a4a41e1c96d0f486a7b039718dd5f35865af2