From: Joey Hess <joey@kitenet.net>
Date: Sun, 27 Nov 2011 17:20:24 +0000 (-0400)
Subject: I have no branch and must merge.
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=daaedf27ef7fe18c7c12b13a7db0ed0dae91bd1e;hp=daaedf27ef7fe18c7c12b13a7db0ed0dae91bd1e

I have no branch and must merge.
---