From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 2 Jan 2010 20:11:51 +0000 (-0500)
Subject: Merge remote branch 'tove/master'
X-Git-Tag: 3.20100102.3~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9747c47670064f206189eb3c36a8e7fcfe08e172;p=ikiwiki.git

Merge remote branch 'tove/master'
---

9747c47670064f206189eb3c36a8e7fcfe08e172