Merge pull request #3390 from vbystricky:fix_houghlines
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 5 Nov 2014 11:41:12 +0000 (11:41 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 5 Nov 2014 11:41:12 +0000 (11:41 +0000)

Trivial merge