From: Joey Hess Date: Fri, 23 Jul 2010 18:15:18 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20100804~34 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=87d4ef453c77994abefa55b16ba4c1f52524571f;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 87d4ef453c77994abefa55b16ba4c1f52524571f