From: Joey Hess <joey@kitenet.net>
Date: Wed, 2 Jan 2013 19:29:50 +0000 (-0400)
Subject: Merge commit '6e962a2d747bd8a8bbbdfc5b8eaeb689100c0b1c'
X-Git-Tag: 3.20130212~35
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/c61af5c60829d49abbf1184eed94558f9c144563

Merge commit '6e962a2d747bd8a8bbbdfc5b8eaeb689100c0b1c'
---

c61af5c60829d49abbf1184eed94558f9c144563