From: Joey Hess Date: Wed, 23 Nov 2011 20:06:58 +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=d36d4c4ce5acc44780a4dbcc95a1d2bceee8caa2;hp=-c Merge branch 'master' of ssh://git.ikiwiki.info --- d36d4c4ce5acc44780a4dbcc95a1d2bceee8caa2