From: Joey Hess <joey@kitenet.net>
Date: Tue, 1 Jun 2010 00:46:32 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100610~61
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/eb8d06b3b61b8a9099fd6782b322880b6fc6013a?ds=sidebyside;hp=--cc

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

eb8d06b3b61b8a9099fd6782b322880b6fc6013a