From: Joey Hess <joey@kitenet.net>
Date: Sun, 25 Jul 2010 17:07:30 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100804~20
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/170e930f9d29039a4f8d385ec3bd9850c1cf95fa

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

170e930f9d29039a4f8d385ec3bd9850c1cf95fa