[spyder] 03/04: Merge tag 'upstream/3.1.2+dfsg1'

[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 26eb2fdf162660140dddf83f7a97ff39cf83d8f2
Merge: e0fc210 925711f
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Tue Jan 24 22:51:01 2017 +0100

    Merge tag 'upstream/3.1.2+dfsg1'
    
    Upstream version 3.1.2+dfsg1

 PKG-INFO                                | 4 ++--
 spyder/__init__.py                      | 2 +-
 spyder/app/mainwindow.py                | 1 +
 spyder/widgets/sourcecode/codeeditor.py | 3 ++-
 4 files changed, 6 insertions(+), 4 deletions(-)

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