From: Joey Hess Date: Wed, 2 Jan 2013 19:32:30 +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=95bfa99e2abf9d717f0eb42891f3175edcb7a8e5 Merge branch 'master' of ssh://git.ikiwiki.info --- 95bfa99e2abf9d717f0eb42891f3175edcb7a8e5