[spyder] 03/04: Merge tag 'upstream/2.2.5+dfsg'

[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 e61b5df7e18b659e49b59e025ee1855ab8942be8
Merge: aa7bf0e 3c8a4e0
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sat Oct 19 20:27:30 2013 +0200

    Merge tag 'upstream/2.2.5+dfsg'
    
    Upstream version 2.2.5+dfsg

 CHANGELOG                                          |   26 +-
 PKG-INFO                                           |    4 +-
 bootstrap.py                                       |    8 +
 doc/installation.rst                               |   10 +-
 doc/variableexplorer.rst                           |   94 +-
 spyderlib/__init__.py                              |    2 +-
 spyderlib/baseconfig.py                            |   36 +-
 spyderlib/ipythonconfig.py                         |   20 +
 spyderlib/locale/es/LC_MESSAGES/spyderlib.mo       |  Bin 92547 -> 92726 bytes
 spyderlib/locale/es/LC_MESSAGES/spyderlib.po       | 2214 ++---
 spyderlib/locale/fr/LC_MESSAGES/spyderlib.mo       |  Bin 84192 -> 89030 bytes
 spyderlib/locale/fr/LC_MESSAGES/spyderlib.po       |10141 ++++++++++----------
 spyderlib/locale/spyderlib.pot                     | 8202 ++++++++--------
 spyderlib/plugins/externalconsole.py               |   44 +-
 spyderlib/plugins/inspector.py                     |    4 +-
 spyderlib/plugins/ipythonconsole.py                |   34 +-
 spyderlib/scientific_startup.py                    |   89 +-
 spyderlib/spyder.py                                |   39 +-
 spyderlib/userconfig.py                            |    9 +-
 spyderlib/widgets/editor.py                        |    5 +-
 .../widgets/externalshell/namespacebrowser.py      |   10 +-
 spyderlib/widgets/externalshell/pythonshell.py     |    4 +-
 .../widgets/externalshell/start_ipython_kernel.py  |   50 +-
 spyderlib/widgets/ipython.py                       |   15 +-
 spyderlib/widgets/sourcecode/base.py               |   16 +-
 spyderlib/widgets/tabs.py                          |   10 +-
 .../locale/es/LC_MESSAGES/p_breakpoints.mo         |  Bin 752 -> 772 bytes
 spyderplugins/locale/es/LC_MESSAGES/p_profiler.mo  |  Bin 790 -> 794 bytes
 spyderplugins/locale/es/LC_MESSAGES/p_pylint.mo    |  Bin 1228 -> 1204 bytes
 .../locale/fr/LC_MESSAGES/p_breakpoints.mo         |  Bin 731 -> 762 bytes
 spyderplugins/locale/fr/LC_MESSAGES/p_profiler.mo  |  Bin 2191 -> 2342 bytes
 spyderplugins/locale/fr/LC_MESSAGES/p_pylint.mo    |  Bin 2458 -> 2633 bytes
 spyderplugins/widgets/pylintgui.py                 |   31 +-
 33 files changed, 10658 insertions(+), 10459 deletions(-)

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