From: Joey Hess Date: Wed, 23 Jun 2010 17:05:02 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20100623~12 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0d1f736c659fcabb484abe77c714c4bf04b34a4f;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 0d1f736c659fcabb484abe77c714c4bf04b34a4f