Merge pull request #1550 from dbungert/gateway
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 17 Oct 2013 21:30:46 +0000 (14:30 -0700)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 17 Oct 2013 21:30:46 +0000 (14:30 -0700)
Gateway: 2 Fixes


Trivial merge