[pytango] 35/37: Merge branch 'tango9' of gitlab.esrf.fr:bliss/pytango into tango9

[Sandor Bodo-Merle]

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

sbodomerle-guest pushed a commit to annotated tag v9.2.0b
in repository pytango.

commit 4027309f841e29af7e6e5726742f4515fd926ceb
Merge: f53d907 370a6f8
Author: Jose Tiago Coutinho Macara <tiago.coutinho at esrf.fr>
Date:   Mon Mar 7 15:42:18 2016 +0100

    Merge branch 'tango9' of gitlab.esrf.fr:bliss/pytango into tango9
    
    Conflicts:
    	Makefile
    	src/boost/python/__init__.py
    	src/boost/python/pytango_init.py


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