[pytango] 461/483: Merge branch 'master' of gitlab.esrf.fr:bliss/pytango

[Sandor Bodo-Merle]

This is an automated email from the git hooks/post-receive script.

sbodomerle-guest pushed a commit to annotated tag bliss_8.10
in repository pytango.

commit f1cc56f88707b56f030ec44f6edc42e38768c88b
Merge: 2e490db 5c08fae
Author: coutinho <coutinho at esrf.fr>
Date:   Mon Apr 13 19:06:28 2015 +0200

    Merge branch 'master' of gitlab.esrf.fr:bliss/pytango

 setup.py                                        |  2 ++
 src/boost/python/databaseds/__init__.py         |  0
 src/boost/python/databaseds/database.py         | 10 +++++-----
 src/boost/python/databaseds/db_access/beacon.py |  2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

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