[python-astropy] 05/05: Merge tag 'debian/0.4.2-2' 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-astropy.

commit efb0fe39dd099c80f6ca2d5d903688fc06fdb7d7
Merge: 84c1076 5f68571
Author: Ole Streicher <olebole at debian.org>
Date:   Mon Jan 19 21:46:03 2015 +0100

    Merge tag 'debian/0.4.2-2' into debian
    
    Conflicts:
    	debian/changelog

 debian/changelog                    |   6 +
 debian/patches/remove_ssl_2_3.patch | 273 ++++++++++++++++++++++++++++++++++++
 debian/patches/series               |   1 +
 3 files changed, 280 insertions(+)

diff --cc debian/changelog
index d57b280,25688bc..9f3274e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
 +python-astropy (0.4.3-1) UNRELEASED; urgency=low
 +
 +  * New upstream release
 +
 + -- Ole Streicher <olebole at debian.org>  Fri, 16 Jan 2015 09:08:39 +0100
 +
+ python-astropy (0.4.2-2) unstable; urgency=medium
+ 
+   * Don't set defalt SSL protocol in vo/samp/client.py. Closes: #775780
+ 
+  -- Ole Streicher <olebole at debian.org>  Mon, 19 Jan 2015 21:07:18 +0100
+ 
  python-astropy (0.4.2-1) unstable; urgency=low
  
    * New upstream release.

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