From: Joey Hess Date: Tue, 19 Apr 2011 21:47:40 +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=ff03d125be4df039489baea31b86ef273486d0d7;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- ff03d125be4df039489baea31b86ef273486d0d7