From: Joey Hess Date: Thu, 13 Jan 2011 23:47:56 +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=f351c67d2ae86a49cb6b1e6cc755b5c0feedb288;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- f351c67d2ae86a49cb6b1e6cc755b5c0feedb288