From: Joey Hess <joey@kitenet.net>
Date: Wed, 29 Sep 2010 16:00:34 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20101019~44
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/e65ce4f0937eaf622846c02a9d39fa7aebe4af12?hp=e65ce4f0937eaf622846c02a9d39fa7aebe4af12

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