From: Joey Hess <joey@gnu.kitenet.net> Date: Wed, 4 Mar 2009 18:51:55 +0000 (-0500) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.07~29 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=108ad03cc81d3ebbd668eab879789f940951d293;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 108ad03cc81d3ebbd668eab879789f940951d293