Merge pull request #9800 from alalek:fix_build_msvs2010
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 9 Oct 2017 12:33:08 +0000 (12:33 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 9 Oct 2017 12:33:08 +0000 (12:33 +0000)

Trivial merge