[gdal/f21: 6/6] Merge branch 'master' into f21

[Volker Fröhlich]

commit 41f375186a7d05598c1093046f1285656621a6d3
Merge: a4f4dff 8bdcf6a
Author: Volker Fröhlich <volker27 at gmx.at>
Date:   Thu Oct 2 18:15:52 2014 +0200

    Merge branch 'master' into f21
    
    Conflicts:
    	gdal.spec

 .gitignore      |    2 ++
 gdal-cleaner.sh |    2 +-
 gdal.spec       |   12 ++++++++----
 sources         |    4 ++--
 4 files changed, 13 insertions(+), 7 deletions(-)
---
diff --cc gdal.spec
index 4812b67,9583d1e..9c8b747
--- a/gdal.spec
+++ b/gdal.spec
@@@ -763,12 -763,22 +763,16 @@@ pop
  #Or as before, using ldconfig
  
  %changelog
+ * Thu Oct  2 2014 Volker Fröhlich <volker27 at gmx.at> - 1.11.1-1
+ - New release
+ - Correct test suite source URL
+ 
 -* Thu Aug 28 2014 Jitka Plesnikova <jplesnik at redhat.com> - 1.11.0-9
 -- Perl 5.20 rebuild
 -
 -* Mon Aug 25 2014 Devrim Gündüz <devrim at gunduz.org> - 1.11.0-7
 -- Rebuilt for libgeotiff 
 +* Fri Sep 19 2014 Volker Fröhlich <volker27 at gmx.at> - 1.11.0-7
 +- Add aarch64 to gdal-config script (BZ#1129295)
  
 -* Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11.0-7
 +* Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11.0-6
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
  
 -* Thu Aug 14 2014 Volker Fröhlich <volker27 at gmx.at> - 1.11.0-6
 -- Add aarch64 to gdal-config script (BZ#1129295)
 -
  * Fri Jul 25 2014 Peter Robinson <pbrobinson at fedoraproject.org> 1.11.0-5
  - rebuild (libspatialite)