From: Joey Hess <joey@kitenet.net>
Date: Sat, 2 Oct 2010 16:03:04 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20101019~41
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/83bfeb959ea218efa9b3e0601486fd0298cb6623?hp=83bfeb959ea218efa9b3e0601486fd0298cb6623

Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
---