From: Joey Hess Date: Sat, 24 Jul 2010 09:22:20 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20100804~26 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a47444fd97d73c756072abe655abf90b591defaa;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- a47444fd97d73c756072abe655abf90b591defaa