From: Joey Hess <joey@kitenet.net>
Date: Wed, 13 Oct 2010 16:59:36 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20101019~7
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/ac4883dd4a1fab814c77cc90df1a02776e7e28d0?hp=ac4883dd4a1fab814c77cc90df1a02776e7e28d0

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