Merge branch 'master' into merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 16 Aug 2013 10:14:12 +0000 (14:14 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Fri, 16 Aug 2013 10:14:12 +0000 (14:14 +0400)
commit2530b580a83e72f384ea7782217305d260203fbe
tree30d1e95d2be1bea291ef2d87727fd4f455668ada
parent339dd983eeaabbe897c5622a10cb1fe2cd1f5fcf
parent556028eff500192f2d81d11d90b394b1003ddfe4
Merge branch 'master' into merge-2.4

Conflicts:
modules/photo/doc/inpainting.rst
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpuimgproc/doc/hough.rst
modules/highgui/doc/user_interface.rst
modules/imgproc/doc/filtering.rst
modules/imgproc/doc/miscellaneous_transformations.rst
modules/photo/doc/inpainting.rst
modules/video/doc/motion_analysis_and_object_tracking.rst