[sardana] 02/06: Merge tag 'upstream/1.3.1'

[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 04eddc3fe7d1967259bef85e9ea9f31b4167c671
Merge: 54974c9 b523d0e
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Mon Feb 17 13:51:52 2014 +0100

    Merge tag 'upstream/1.3.1'
    
    Upstream version 1.3.1

 PKG-INFO                                           |  10 +-
 setup.py                                           |   1 +
 .../pool/poolcontrollers/OneDControllerTimer.py    | 255 ++++++++++++++++++++
 .../pool/poolcontrollers/OneDControllerTimer.py~   | 257 +++++++++++++++++++++
 src/sardana/release.py                             |   2 +-
 5 files changed, 519 insertions(+), 6 deletions(-)

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