Roman Donchenko 2530b580a8 Merge branch 'master' into merge-2.4
Conflicts:
	modules/photo/doc/inpainting.rst
2013-08-16 14:14:12 +04:00
..
2013-08-06 18:07:00 +04:00
2013-08-06 18:07:00 +04:00
2013-03-26 12:01:01 +08:00
2013-04-05 21:11:59 +04:00