From: Joey Hess Date: Tue, 25 Jan 2011 19:46:37 +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=c4283919acbd138776751e83d79c96d55703f4eb;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- c4283919acbd138776751e83d79c96d55703f4eb