Merge pull request #7745 from ColinFinck:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 28 Nov 2016 16:09:42 +0000 (16:09 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 28 Nov 2016 16:09:42 +0000 (16:09 +0000)
commit35db7f67e0449bf0ec365316705dcda16a897a53
treeaf5b3e723bb65d19a937546bcfcab3a5651b812b
parente04eb8cc04289c5ea38a1fb31c6297473a6a0f3b
parente8f591143ca30433981c1c72db0df1acca054444
Merge pull request #7745 from ColinFinck:master