From: Joey Hess <joey@kitenet.net>
Date: Fri, 9 Dec 2011 17:18:50 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20111229~59
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/8eec88bd7ccd4b900e96bc2db0c29224dcf5399b?hp=8eec88bd7ccd4b900e96bc2db0c29224dcf5399b

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