From: Joey Hess Date: Wed, 30 Nov 2011 16:15:39 +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=2615b92fd43e588bc401d328a1fbf8435e028528;hp=-c Merge branch 'master' of ssh://git.ikiwiki.info --- 2615b92fd43e588bc401d328a1fbf8435e028528