From: Joey Hess Date: Tue, 14 Jun 2011 20:28:09 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c4154e8a45615ab99f22aa2cfe42788f1ce974cc;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- c4154e8a45615ab99f22aa2cfe42788f1ce974cc