From: Joey Hess Date: Sat, 25 Sep 2010 19:00:31 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20100926~9 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0740855836c07165c9dd219ac1e910bb72e2409f;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 0740855836c07165c9dd219ac1e910bb72e2409f