From: Joey Hess Date: Thu, 17 Jun 2010 20:52:33 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20100623~45 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f70bc8184ace2cf10687daedf2b7176f32ef8a97;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- f70bc8184ace2cf10687daedf2b7176f32ef8a97