[Debian-astro-commits] [python-pyds9] 01/02: Merge branch 'upstream' into debian

[Ole Streicher]

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

olebole pushed a commit to branch debian
in repository python-pyds9.

commit b7249c76b159504111655fc28100d1e954824bb1
Merge: 62a4860 6c6c337
Author: Ole Streicher <ole at aip.de>
Date:   Fri Jan 29 09:36:28 2016 +0100

    Merge branch 'upstream' into debian

 changelog |  3 +++
 ds9.py    |  7 -----
 pyds9.py  | 90 +++++++++++++++++++++++++++++++++++++++++++++++----------------
 setup.py  |  4 +--
 4 files changed, 73 insertions(+), 31 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/python-pyds9.git