Merge pull request #2394 from awakecoding/master
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 12 Feb 2015 19:52:48 +0000 (14:52 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 12 Feb 2015 19:52:48 +0000 (14:52 -0500)
TS Gateway Connection and ADM Refactoring


Trivial merge