From: Joey Hess Date: Wed, 29 Dec 2010 17:08:18 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20101231~11 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/468c1c4496eade7a1a4ff6fe22aa82f5eefd3164?hp=-c Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 468c1c4496eade7a1a4ff6fe22aa82f5eefd3164