From: Joey Hess Date: Sun, 13 Jun 2010 12:49:32 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20100623~72 X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=a0dbdcad77a97ab1219beeb8a92305538500ba3a Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- a0dbdcad77a97ab1219beeb8a92305538500ba3a