Matthias Bady e17da9a843 merge with upstream		2014-01-05 19:00:25 +01:00
..
opencv2	merge with upstream	2014-01-05 19:00:25 +01:00