From: Joey Hess Date: Tue, 28 Dec 2010 17:51:12 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20101231~15 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/2de20bf48b4a0c215c58b28b2ec789d65a4fb4e8 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 2de20bf48b4a0c215c58b28b2ec789d65a4fb4e8