[opencv] 97/98: Merge branch '2.4.12.x-prep' into 2.4

[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 ec2ff7f0c0b4ac21463354328eda1a0c78bd35dc
Merge: 5d03868 8e40bec
Author: Alexander Alekhin <alexander.alekhin at itseez.com>
Date:   Wed Apr 20 16:26:12 2016 +0300

    Merge branch '2.4.12.x-prep' into 2.4


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