From: Joey Hess Date: Sun, 24 Feb 2008 22:01:59 +0000 (-0500) Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info X-Git-Tag: 2.40~54 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fab5151a865cd5124c8ac378c48b01ccc4469a8e;p=ikiwiki.git Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info --- fab5151a865cd5124c8ac378c48b01ccc4469a8e