[spyder] 01/02: Merge tag 'upstream/2.3.6+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 7720fb14ed80ddc6efe992a0fd4e906c92c68fef
Merge: 4adf95e 9068128
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Thu Aug 27 11:33:27 2015 +0200

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

 PKG-INFO                                           |   4 +-
 README.md                                          |   2 +-
 doc/installation.rst                               |   5 +-
 spyderlib/__init__.py                              |   7 +-
 spyderlib/ipythonconfig.py                         |  39 +-
 spyderlib/locale/es/LC_MESSAGES/spyderlib.mo       | Bin 97489 -> 97535 bytes
 spyderlib/locale/es/LC_MESSAGES/spyderlib.po       | 421 +++++++++++----------
 spyderlib/locale/fr/LC_MESSAGES/spyderlib.mo       | Bin 99259 -> 99259 bytes
 spyderlib/locale/fr/LC_MESSAGES/spyderlib.po       | 420 ++++++++++----------
 spyderlib/locale/spyderlib.pot                     | 419 ++++++++++----------
 spyderlib/plugins/editor.py                        |   9 +-
 spyderlib/plugins/inspector.py                     |   2 +-
 spyderlib/plugins/ipythonconsole.py                |  34 +-
 spyderlib/qt/__init__.py                           |  24 +-
 spyderlib/spyder.py                                |  43 +--
 spyderlib/utils/iofuncs.py                         |   2 +-
 spyderlib/widgets/arrayeditor.py                   |   2 +-
 spyderlib/widgets/calltip.py                       |   4 +-
 spyderlib/widgets/dataframeeditor.py               |  20 +-
 spyderlib/widgets/dicteditor.py                    |  12 +-
 spyderlib/widgets/dicteditorutils.py               |  25 +-
 spyderlib/widgets/editor.py                        |  12 +-
 .../widgets/externalshell/namespacebrowser.py      |  21 +-
 .../widgets/externalshell/start_ipython_kernel.py  |   8 +
 spyderlib/widgets/ipython.py                       |   5 +-
 spyderlib/widgets/sourcecode/codeeditor.py         |   4 +
 .../locale/es/LC_MESSAGES/p_breakpoints.mo         | Bin 772 -> 772 bytes
 spyderplugins/locale/es/LC_MESSAGES/p_profiler.mo  | Bin 794 -> 794 bytes
 spyderplugins/locale/es/LC_MESSAGES/p_pylint.mo    | Bin 1137 -> 1137 bytes
 .../locale/fr/LC_MESSAGES/p_breakpoints.mo         | Bin 762 -> 762 bytes
 spyderplugins/locale/fr/LC_MESSAGES/p_profiler.mo  | Bin 2342 -> 2342 bytes
 spyderplugins/locale/fr/LC_MESSAGES/p_pylint.mo    | Bin 2594 -> 2594 bytes
 32 files changed, 815 insertions(+), 729 deletions(-)

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