From: Joey Hess <joey@kitenet.net>
Date: Sun, 19 Aug 2012 00:56:40 +0000 (-0700)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20120725~29
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/79414caf54ca1f3c126526595eab2d86616c9821

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

79414caf54ca1f3c126526595eab2d86616c9821