From: Joey Hess <joey@kitenet.net>
Date: Thu, 2 Dec 2010 00:36:07 +0000 (-0400)
Subject: Merge branch 'bugfix'
X-Git-Tag: 3.20101231~90
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/017f335aff7df37d0a22f11f45fec05c5e446826?ds=sidebyside;hp=017f335aff7df37d0a22f11f45fec05c5e446826

Merge branch 'bugfix'
---