Merge stderr and stdout when checking for timeouts
Merge pull request #223 from piojo/resolver-fix

ncm-resolver: Merge stderr and stdout when checking for timeouts