Merge remote-tracking branch 'kevinburke/domain-failure-connection-error' into bug...
authorIan Cordasco <ian.cordasco@rackspace.com>
Fri, 29 Aug 2014 21:43:51 +0000 (16:43 -0500)
committerIan Cordasco <ian.cordasco@rackspace.com>
Fri, 29 Aug 2014 21:43:51 +0000 (16:43 -0500)

Trivial merge