From: Joey Hess Date: Wed, 9 Feb 2011 17:22:52 +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=0c68cd556a7d2c7395aed2a4e101c0ced0e33726;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 0c68cd556a7d2c7395aed2a4e101c0ced0e33726