From: Joey Hess <joey@kitenet.net>
Date: Sun, 28 Nov 2010 17:35:52 +0000 (-0400)
Subject: Merge remote branch 'blipvert/fixes'
X-Git-Tag: 3.20101129~10
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/93d77673e44c1c4019a2fcbae2e450f095c4426a

Merge remote branch 'blipvert/fixes'
---

93d77673e44c1c4019a2fcbae2e450f095c4426a