Merge pull request #7000 from StevenPuttemans:fix_master_build
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 27 Jul 2016 18:17:37 +0000 (18:17 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 27 Jul 2016 18:17:37 +0000 (18:17 +0000)
commit328da251ed4094677c4f334ea8e1893678f43ad6
tree7c63dfdb2e53f43de4d5daa13751395227cef204
parent085ea5049b42ca04974a633126c75321b68bc506
parent64dbf6c987f8197406020ef1defc7a46f78fb73f
Merge pull request #7000 from StevenPuttemans:fix_master_build