Merge pull request #2403 from awakecoding/master
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 18 Feb 2015 18:56:25 +0000 (13:56 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 18 Feb 2015 18:56:25 +0000 (13:56 -0500)
Transport, Gateway, Sockets


Trivial merge