Merge pull request #1414 from lluisgomez:scene_text_detection_computeNMChannels
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 13 Sep 2013 09:31:14 +0000 (13:31 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 13 Sep 2013 09:31:14 +0000 (13:31 +0400)

Trivial merge