Roman Donchenko 4db12032dc Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... No conflicts! Amazing!		2014-04-21 16:47:35 +04:00
..
opencv2	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-04-21 16:47:35 +04:00