From: Joey Hess Date: Sat, 17 Jan 2009 03:39:46 +0000 (-0500) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.02~13 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0993933ea30f4fb28402f12a033cdd37015da427;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 0993933ea30f4fb28402f12a033cdd37015da427