From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 11 Dec 2009 03:19:19 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20091218~20
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/a21aa6b9c562cdf451977b80cbf5b31cb4d28bac

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

a21aa6b9c562cdf451977b80cbf5b31cb4d28bac