From: Joey Hess <joey@kitenet.net>
Date: Mon, 21 Nov 2011 18:13:24 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20111107~57
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/45bd60365252954c31e688ce8207045730744e00

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

45bd60365252954c31e688ce8207045730744e00