From: Joey Hess <joey@kitenet.net>
Date: Thu, 15 Dec 2011 18:05:07 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20111229~57
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/95ea0d7e54e84f01aa8d1cb590769ff8d806f987?hp=95ea0d7e54e84f01aa8d1cb590769ff8d806f987

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