Erik Karlsson 5a7118a88b Merging in master		2015-03-09 22:00:58 +01:00
..
opencv2	Merging in master	2015-03-09 22:00:58 +01:00