From: Joey Hess <joey@kitenet.net>
Date: Thu, 16 Jun 2011 17:05:05 +0000 (-0400)
Subject: Merge branch 'tova'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6d80bdda7c0cea5fa538733d5ed5c510bb7b1ee1;p=ikiwiki.git

Merge branch 'tova'
---

6d80bdda7c0cea5fa538733d5ed5c510bb7b1ee1