Commit 5d74fb78392d62c6920de466ce461c9d44340bf1

Carlos Martín Nieto 2015-05-21T06:32:29

Merge pull request #3145 from stinb/fix_cxx_build Fix error when building as C++.