From: Joey Hess Date: Sat, 2 Feb 2008 22:51:47 +0000 (-0500) Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info X-Git-Tag: 2.30 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=20cbcdf4bf958b47dc387499edad0bbc26ce46df;p=ikiwiki.git Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info --- 05e180096c6ef808ab16cce4922595eeca9b9b25