From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 19:32:20 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100610~16
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/2eefd84d0adbcaaaf4aa1c306a1c745fa52f3c9b?ds=inline;hp=--cc

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

2eefd84d0adbcaaaf4aa1c306a1c745fa52f3c9b