From: Joey Hess <joey@kitenet.net>
Date: Tue, 6 Dec 2011 18:57:23 +0000 (-0400)
Subject: Merge remote-tracking branch 'smcv/coverage'
X-Git-Tag: 3.20111229~65
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/2e4340766e792d93f2ce0a86f5c8d8042bbee789?hp=-c

Merge remote-tracking branch 'smcv/coverage'
---

2e4340766e792d93f2ce0a86f5c8d8042bbee789