From: Joey Hess Date: Wed, 15 Sep 2010 19:38:24 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20100915~2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0e89f374a6728e76b512d00224eb9a9455ed7939;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 0e89f374a6728e76b512d00224eb9a9455ed7939