From: Joey Hess Date: Mon, 21 Nov 2011 15:16:30 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bbce8b15ccfccbc3bfb0a8e231649fa3870e706b;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- bbce8b15ccfccbc3bfb0a8e231649fa3870e706b