[sardana] 01/02: Merge tag 'upstream/2.2.2'

[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 sardana.

commit 7afc03d8b0e091424fb8ea08c6b52a7421e55ccf
Merge: 87d5da5 f086cc0
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Wed Jan 11 17:59:17 2017 +0100

    Merge tag 'upstream/2.2.2'
    
    Upstream version 2.2.2

 CHANGELOG.md                                            | 17 ++++++++++++++++-
 PKG-INFO                                                |  2 +-
 doc/man/MacroServer.1                                   |  4 ++--
 doc/man/Pool.1                                          |  4 ++--
 doc/man/Sardana.1                                       |  4 ++--
 doc/man/diffractometeralignment.1                       |  4 ++--
 doc/man/hklscan.1                                       |  4 ++--
 doc/man/macroexecutor.1                                 |  4 ++--
 doc/man/sardanatestsuite.1                              |  4 ++--
 doc/man/sequencer.1                                     |  4 ++--
 doc/man/spock.1                                         |  4 ++--
 doc/man/ubmatrix.1                                      |  4 ++--
 src/sardana.egg-info/PKG-INFO                           |  2 +-
 src/sardana/macroserver/macros/test/sardemoenv.py       | 10 ++++++----
 src/sardana/release.py                                  |  2 +-
 .../taurus/qt/qtgui/extra_sardana/expdescription.py     |  4 +++-
 16 files changed, 48 insertions(+), 29 deletions(-)

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