From: Joey Hess Date: Sat, 8 May 2010 17:00:29 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20100515~51 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1cf4536289396726f0ee858f46a3f133d1675c68;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 1cf4536289396726f0ee858f46a3f133d1675c68