From: Joey Hess Date: Wed, 14 Dec 2011 21:01:21 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fbedf85587d632976071788dec9de374494480fb;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- fbedf85587d632976071788dec9de374494480fb