From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 12 Dec 2009 20:50:32 +0000 (-0500)
Subject: merge
X-Git-Tag: 3.20091218~12
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0fe8cfd3e1dad0816947fdf88cc0dba778aea067;p=ikiwiki.git

merge
---

0fe8cfd3e1dad0816947fdf88cc0dba778aea067