From: Joey Hess Date: Fri, 28 Aug 2009 00:19:28 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.1415926~38 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/ff0cb2a7bf0756bb232cd73fc8bb6616737448c1?ds=inline;hp=-c Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- ff0cb2a7bf0756bb232cd73fc8bb6616737448c1