Merge pull request #2436 from colindickson/master
authorCory Benfield <lukasaoz@gmail.com>
Tue, 3 Feb 2015 06:50:11 +0000 (06:50 +0000)
committerCory Benfield <lukasaoz@gmail.com>
Tue, 3 Feb 2015 06:50:11 +0000 (06:50 +0000)
Fix for failing test: test_connection_error


Trivial merge