From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 24 Jul 2008 16:37:17 +0000 (-0400)
Subject: Merge branch 'tova'
X-Git-Tag: 2.55~42
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cf597d71665d11815640569eda017825ca0c20bc;p=ikiwiki.git

Merge branch 'tova'
---

cf597d71665d11815640569eda017825ca0c20bc