Merge pull request #1859 from awakecoding/master
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 22 May 2014 20:16:21 +0000 (16:16 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 22 May 2014 20:16:21 +0000 (16:16 -0400)
Smart Card Improvements, TS Gateway non-blocking Writes Integration


Trivial merge