Merge pull request #2321 from awakecoding/master
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 20 Jan 2015 15:55:15 +0000 (10:55 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 20 Jan 2015 15:55:15 +0000 (10:55 -0500)
commite5dee8fd3a6bf20237e0c0d0efef05d824882d6e
treebc461f5d8039575f1580917da7f4cd2fb71d3396
parent8e7b80b25ab323df35fc0eec325a598ac161c45a
parent4fe932f21fbce7eef814587f8cf3e8e309ed3f9d
Merge pull request #2321 from awakecoding/master

SmartCard Robustness, Revert broken channel loading