[spyder] 04/07: Merge branch 'upstream'

[Frédéric-Emmanuel Picca]

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

picca pushed a commit to branch master
in repository spyder.

commit 2de96ad5dedd1ebed64e64f813333975e606445e
Merge: 45cb42a 6211d4d
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sun Oct 30 19:16:10 2016 +0100

    Merge branch 'upstream'


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