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

Merge branch 'master' into autotag
---

0fcbcc4815042531eb58de339844a3767fb5e707