From: Joey Hess Date: Sat, 20 Dec 2008 22:58:01 +0000 (-0500) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 2.71~34 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=92b48bab99e04e7c041434e106179822bd2b1e88;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 92b48bab99e04e7c041434e106179822bd2b1e88