Merge pull request #856 from ericgreveson:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 10 Jun 2013 11:25:07 +0000 (15:25 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 10 Jun 2013 11:25:09 +0000 (15:25 +0400)
1  2 
modules/imgproc/src/histogram.cpp

Simple merge