From: Joey Hess <joey@kitenet.net>
Date: Sun, 23 Feb 2014 18:21:13 +0000 (-0400)
Subject: Merge remote-tracking branch 'remotes/smcv/ready/careful-eval'
X-Git-Tag: debian/3.20140227~18
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/ddc9441beb0c85e1f7578f4e31c9bf5497955e5e

Merge remote-tracking branch 'remotes/smcv/ready/careful-eval'
---

ddc9441beb0c85e1f7578f4e31c9bf5497955e5e