From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 7 Jan 2010 20:10:29 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100122~55
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/db44ee6ed0bcadcda070a9fddc0e8ceb5a468527?hp=db44ee6ed0bcadcda070a9fddc0e8ceb5a468527

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