[python-imageio] 02/06: Merge tag 'upstream/2.1.2+ds1'

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch master
in repository python-imageio.

commit fb6e8f78f8a01e69300e0a28b4004609edbb866c
Merge: 55bef2f 31f5682
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Tue Feb 28 11:57:10 2017 +0000

    Merge tag 'upstream/2.1.2+ds1'
    
    Upstream version 2.1.2+ds1
    
    # gpg: Signature made Tue 28 Feb 2017 11:57:06 GMT
    # gpg:                using RSA key F3DB8E7525060E1BDB84C20D6A990FB3DDEB910A
    # gpg:                issuer "ghisvail at gmail.com"
    # gpg: Good signature from "Ghislain Antony Vaillant <ghisvail at gmail.com>" [ultimate]

 PKG-INFO                       |  2 +-
 docs/releasenotes.rst          | 21 +++++++++++++++++++++
 imageio/__init__.py            |  2 +-
 imageio/core/__init__.py       |  2 +-
 imageio/core/format.py         | 15 ++++++++++++++-
 imageio/core/request.py        | 38 +++++++++++++++++++++++++++++++++++++-
 imageio/plugins/ffmpeg.py      | 37 +++++++++++++++----------------------
 imageio/plugins/pillowmulti.py | 14 +++++++++++---
 tests/test_ffmpeg.py           | 17 +++++++++++++++++
 tests/test_pillow.py           | 10 +++++++++-
 10 files changed, 127 insertions(+), 31 deletions(-)

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