From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 10 Sep 2009 21:04:20 +0000 (-0400)
Subject: Merge commit 'schmonz/master'
X-Git-Tag: 3.14159265~61
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9ef4b5e677919f95dd2aa08ca51a0313c6c5542d;p=ikiwiki.git

Merge commit 'schmonz/master'
---

9ef4b5e677919f95dd2aa08ca51a0313c6c5542d