From: Joey Hess Date: Wed, 29 Dec 2010 17:08:18 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=468c1c4496eade7a1a4ff6fe22aa82f5eefd3164;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 468c1c4496eade7a1a4ff6fe22aa82f5eefd3164