From: Joey Hess <joey@kitenet.net>
Date: Tue, 8 Mar 2011 01:56:04 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20110321~12
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/d162bf767e1e57502c4a767fa5a6ec42a5857c59

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

d162bf767e1e57502c4a767fa5a6ec42a5857c59