From: Joey Hess <joey@kitenet.net>
Date: Mon, 23 Jan 2012 22:16:26 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=0376a8da8ac42a4c7da4acfd588767ff8e062364;hp=-c

Merge branch 'master' of ssh://git.ikiwiki.info
---

0376a8da8ac42a4c7da4acfd588767ff8e062364