From: Joey Hess Date: Sat, 30 Oct 2010 16:42:10 +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=0bfcc8da5d769ff4ba9425a99d2c495175ea685e;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 0bfcc8da5d769ff4ba9425a99d2c495175ea685e