From: Joey Hess Date: Sat, 18 Sep 2010 16:58:41 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20100926~21 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4843ec6dd09f4d88fa05ce178abe9cc1fb52b3e7;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 4843ec6dd09f4d88fa05ce178abe9cc1fb52b3e7