[qgis: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/qgis

[Volker Fröhlich]

commit e09e205560ca0175984c4fe49c4226b63c66af56
Merge: 5d01156 1a72f12
Author: Volker Fröhlich <volker27 at gmx.at>
Date:   Tue Sep 24 00:51:27 2013 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/qgis
    
    Conflicts:
    	qgis.spec

 qgis.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --cc qgis.spec
index 8a7aaca,48f228c..a0952c6
--- a/qgis.spec
+++ b/qgis.spec
@@@ -375,9 -367,9 +375,12 @@@ gtk-update-icon-cache %{_datadir}/icons
  %{_libexecdir}/%{name}
  
  %changelog
- * Mon Sep  9 2013 Volker Fröhlich <volker27 at gmx.at> - 2.0.1-1
++* Tue Sep 24 2013 Volker Fröhlich <volker27 at gmx.at> - 2.0.1-1
 +- New upstream release
 +
+ * Sat Sep 14 2013 Volker Fröhlich <volker27 at gmx.at> - 1.8.0-17
+ - Rebuild for grass 6.4.3
+ 
  * Tue Aug 27 2013 Orion Poplawski <orion at cora.nwra.com> - 1.8.0-16
  - Rebuild for gdal 1.10.0