From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 28 Aug 2009 00:06:48 +0000 (-0400)
Subject: Merge commit 'intrigeri/master' into slop
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/8f783821c34922281c858a2715663ee0b7ca006b?ds=inline;hp=-c

Merge commit 'intrigeri/master' into slop
---

8f783821c34922281c858a2715663ee0b7ca006b