Merge pull request #4155 from MSOpenTech:highgui_contrib
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 29 Jun 2015 12:44:16 +0000 (12:44 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 29 Jun 2015 12:44:16 +0000 (12:44 +0000)

Trivial merge