From: Joey Hess Date: Sat, 20 Nov 2010 18:54:51 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a2c040f1fc565b546750e014df2e412ab0e68cc1;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- a2c040f1fc565b546750e014df2e412ab0e68cc1