From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Jul 2010 18:24:48 +0000 (-0400)
Subject: Merge commit '862fc7c1ab1f7d709561bcb02fc8ede57b90a51b'
X-Git-Tag: 3.20100804~30
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e5f67d3c8bd59ff715e2d71c3b4747aa11c61085;p=ikiwiki.git

Merge commit '862fc7c1ab1f7d709561bcb02fc8ede57b90a51b'
---

e5f67d3c8bd59ff715e2d71c3b4747aa11c61085