[opencv] 79/98: Merge pull request #6386 from mshabunin:fix-python-test-issue

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to annotated tag 2.4.13
in repository opencv.

commit e90b697cb04e798b5e8781c771074450ee0bff2d
Merge: 52ba377 70bc268
Author: Maksim Shabunin <maksim.shabunin at itseez.com>
Date:   Tue Apr 12 08:29:44 2016 +0000

    Merge pull request #6386 from mshabunin:fix-python-test-issue

 modules/python/test/nonfree_tests/nonfree_surf.py |   2 +-
 modules/python/test/test.py                       | 109 +---------------------
 modules/python/test/tests_common.py               | 107 ++++++++++++++++++++-
 3 files changed, 109 insertions(+), 109 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git