This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch debian
in repository python-astropy.
commit 89dd317840ad6d64d9e74c010926658aae9bfa8c
Merge: efb0fe3 1cc8ef5
Author: Ole Streicher <olebole at debian.org>
Date: Thu Jan 22 08:48:39 2015 +0100
Merge branch 'upstream' into debian
CHANGES.rst | 37 +++++++++++++++++++++++++++++++
PKG-INFO | 4 ++--
astropy/version.py | 8 +++----
astropy/vo/samp/client.py | 17 ++++++---------
astropy/vo/samp/hub.py | 19 +++++++---------
astropy/vo/samp/hub_proxy.py | 19 +++++++---------
astropy/vo/samp/hub_script.py | 28 +++++++++++++-----------
astropy/vo/samp/integrated_client.py | 30 +++++++++++++-------------
astropy/vo/samp/ssl_utils.py | 42 +++++++++++++++++++++++-------------
astropy/wcs/tests/test_utils.py | 3 +++
astropy/wcs/wcs.py | 6 ++++++
setup.py | 2 +-
12 files changed, 134 insertions(+), 81 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/python-astropy.git