Merge pull request #2 from opencv/master
authorEric Sommerlade <eric@robots.ox.ac.uk>
Tue, 25 Oct 2016 17:47:12 +0000 (18:47 +0100)
committerGitHub <noreply@github.com>
Tue, 25 Oct 2016 17:47:12 +0000 (18:47 +0100)
commit5ebdf6cedd0ab68b3a9dc3f83c037f08c54d02c4
tree2cb24b2b38eaab058904c641d5a55c752da4b1ba
parent6447c7b2f4d9a0454768e07cee3b9e93ff6844ab
parentdc9602ee84f64eea266e1835f824fc5b7745a87e
Merge pull request #2 from opencv/master

update to master