From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 12 Mar 2008 14:35:56 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.41~151
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/db0d6c5f012bb2f4bc1df5cd1a032e7469a8d331?hp=db0d6c5f012bb2f4bc1df5cd1a032e7469a8d331

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