From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 9 Jan 2010 21:20:14 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100122~36
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/9dbeb003df73ff04fe608558004a6bfe4e3eaf78?hp=-c

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

9dbeb003df73ff04fe608558004a6bfe4e3eaf78