From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 20 Feb 2008 21:45:34 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.40~79
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/77894a6831ae9cc8a90adbc6de0ab3c92408c316?hp=--cc

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

77894a6831ae9cc8a90adbc6de0ab3c92408c316