[fiona] 08/12: Merge branch 'master' into gdal-2.0

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository fiona.

commit 13c3876677b1910ff650d6a855581f4bde67390a
Merge: 6f498bd 70283a1
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Feb 6 22:53:40 2016 +0100

    Merge branch 'master' into gdal-2.0
    
    Conflicts:
    	debian/changelog

 CHANGES.txt           |  9 +++++++++
 debian/changelog      | 13 +++++++++++--
 debian/control        |  4 ++--
 fiona/__init__.py     |  2 +-
 fiona/errors.py       | 21 ++++++++++++++++++++-
 fiona/ogrext.pyx      | 40 +++++++++++++++++++++++++---------------
 tests/test_unicode.py | 28 ++++++++++++++++++++++++++++
 7 files changed, 96 insertions(+), 21 deletions(-)

diff --cc debian/changelog
index 73b63af,75614c2..f6d5a32
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,18 @@@
- fiona (1.6.2-2) UNRELEASED; urgency=medium
+ fiona (1.6.3-2) UNRELEASED; urgency=medium
  
 +  * Team upload.
+   * Update Vcs-Git URL to use HTTPS.
 +  * Add patches for GDAL 2.0 support.
  
-  -- Bas Couwenberg <sebastic at debian.org>  Fri, 23 Oct 2015 21:50:46 +0200
+  -- Bas Couwenberg <sebastic at debian.org>  Fri, 05 Feb 2016 18:10:31 +0100
+ 
+ fiona (1.6.3-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * New upstream release.
+   * Update Vcs-Browser URL to use HTTPS.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Fri, 25 Dec 2015 02:25:10 +0100
  
  fiona (1.6.2-1) unstable; urgency=medium
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/fiona.git