From: Joey Hess Date: Mon, 16 Nov 2009 20:54:28 +0000 (-0500) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20091202~52 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=abec6019a064a06d39a487982ff4165b3d34e7b1;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- abec6019a064a06d39a487982ff4165b3d34e7b1