From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 8 Sep 2008 16:29:56 +0000 (-0400)
Subject: Merge commit 'origin/pristine-tar' into pristine-tar
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/c1d281286ae4e4a1732ee5002079045bbdcb077f?ds=inline

Merge commit 'origin/pristine-tar' into pristine-tar
---

c1d281286ae4e4a1732ee5002079045bbdcb077f