From: Joey Hess Date: Sat, 1 Mar 2008 03:47:26 +0000 (-0500) Subject: Merge branch 'master' of git://git.madduck.net/code/ikiwiki X-Git-Tag: 2.40~5 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/279db7860dc98bedbd8333bb7de57251dcfb223d Merge branch 'master' of git://git.madduck.net/code/ikiwiki --- 279db7860dc98bedbd8333bb7de57251dcfb223d