Merge remote-tracking branch 'remotes/smcv/ready/careful-eval'
authorJoey Hess <joey@kitenet.net>
Sun, 23 Feb 2014 18:21:13 +0000 (14:21 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 23 Feb 2014 18:21:13 +0000 (14:21 -0400)
commitddc9441beb0c85e1f7578f4e31c9bf5497955e5e
tree189b99c23e7b165ef79a21feab7c9a7de5b408a9
parent876a1cf41c26afb8e025a4c2ecb8b1b441e87edb
parentbb359796b80d2e8bd36f6c8eafe9510874184e32
Merge remote-tracking branch 'remotes/smcv/ready/careful-eval'