From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 19:53:59 +0000 (-0400)
Subject: Merge branch 'master' into autotag
X-Git-Tag: 3.20100427~62^2~12
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9951060f624b69053cff2bba88dab6e0ed8eec10;p=ikiwiki.git

Merge branch 'master' into autotag
---

9951060f624b69053cff2bba88dab6e0ed8eec10