From: Joey Hess <joey@kitenet.net>
Date: Fri, 8 Oct 2010 23:31:06 +0000 (-0400)
Subject: Merge branch 'revert'
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=f826251a6d506d6f8a31e30abfbe89338351bd6a

Merge branch 'revert'
---

f826251a6d506d6f8a31e30abfbe89338351bd6a