From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 11 Sep 2009 22:14:58 +0000 (-0400)
Subject: Merge commit 'schmonz/master'
X-Git-Tag: 3.14159265~53
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4a7189965f2831e0c841182902ecae3e53f4af5f;p=ikiwiki.git

Merge commit 'schmonz/master'
---

4a7189965f2831e0c841182902ecae3e53f4af5f