From: Joey Hess Date: Fri, 7 May 2010 17:03:30 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20100515~71^2~3 X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=ec2790b0ec152afc2dc8a29ce89f9b140a1e7647 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- ec2790b0ec152afc2dc8a29ce89f9b140a1e7647