From: Joey Hess Date: Mon, 24 Jan 2011 21:02:11 +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=930682fcffa45a924edcff971985486d83b90105;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 930682fcffa45a924edcff971985486d83b90105