Merge pull request #1101 from fbenkstein/vs2010
authorNico Weber <nicolasweber@gmx.de>
Fri, 5 Feb 2016 16:39:40 +0000 (11:39 -0500)
committerNico Weber <nicolasweber@gmx.de>
Fri, 5 Feb 2016 16:39:40 +0000 (11:39 -0500)
disable warning about conditional expressions


Trivial merge