From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 27 Jan 2009 01:05:36 +0000 (-0500)
Subject: Merge commit 'smcv/updated'
X-Git-Tag: 3.03~13
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=848ff1bf5e218c57cc738a85ed02d7e1396c1d22

Merge commit 'smcv/updated'
---

848ff1bf5e218c57cc738a85ed02d7e1396c1d22