From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 21 Mar 2008 20:34:17 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.41~30
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/060183df6797c22edad0bef0d75ee9043b211bf8

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

060183df6797c22edad0bef0d75ee9043b211bf8