From: Joey Hess Date: Sat, 3 Mar 2012 21:34:46 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=503869ce88eb712d506082b0a80ef447aca0e646;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- 503869ce88eb712d506082b0a80ef447aca0e646