From: Joey Hess <joey@kitenet.net>
Date: Mon, 30 Jan 2012 19:20:54 +0000 (-0400)
Subject: Merge remote-tracking branch 'schmonz/portability'
X-Git-Tag: 3.20120202~15
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/545bf43670d4c31a260c82c4d99aa878679a8340

Merge remote-tracking branch 'schmonz/portability'
---

545bf43670d4c31a260c82c4d99aa878679a8340