From: Joey Hess <joey@kitenet.net>
Date: Sun, 9 May 2010 16:56:07 +0000 (-0400)
Subject: Merge remote branch 'smcv/ready/no-tags'
X-Git-Tag: 3.20100515~33^2~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7f894a025da2c7cfc851d3c60cadc33c586c78d1;p=ikiwiki.git

Merge remote branch 'smcv/ready/no-tags'
---

7f894a025da2c7cfc851d3c60cadc33c586c78d1