From: Joey Hess Date: Sat, 19 Oct 2013 15:26:18 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Tag: debian/3.20140102~79 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/970547f7bc72c235a535a583b9cfa26f50e3e36a?hp=-c Merge branch 'master' of ssh://git.ikiwiki.info --- 970547f7bc72c235a535a583b9cfa26f50e3e36a