From: Joey Hess Date: Sat, 23 Oct 2010 21:25:25 +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=42e97a4a69581c9a2a8198f8149c5feece09cee5;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 42e97a4a69581c9a2a8198f8149c5feece09cee5