Merge pull request #2991 from xdqi/master
authorHardening <rdp.effort@gmail.com>
Mon, 30 Nov 2015 09:52:40 +0000 (10:52 +0100)
committerHardening <rdp.effort@gmail.com>
Mon, 30 Nov 2015 09:52:40 +0000 (10:52 +0100)
Fix compilation error under Visual Studio 2010


Trivial merge