From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 12 May 2008 21:06:10 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.46~7
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/30746d12a5e88e9324f8506cd1eafab1694ba651

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

30746d12a5e88e9324f8506cd1eafab1694ba651