From: Joey Hess <joey@kitenet.net>
Date: Thu, 1 Sep 2011 15:38:46 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20110905~18
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/ad22a39cfe57d6ed1e80434276c7c77dcbd217c7?hp=-c

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

ad22a39cfe57d6ed1e80434276c7c77dcbd217c7