From: Joey Hess Date: Sat, 29 Aug 2009 18:01:03 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.1415926~6 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=29db15d31cff5e8b59020ad908ea4985e62ff22e;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 29db15d31cff5e8b59020ad908ea4985e62ff22e