63c8814 Merge branch 'master' of ssh://pkgs.fedoraproject.org/qgis

Merged and Committed by volter 10 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/qgis
    
    Conflicts:
    	qgis.spec
    
        
file modified
+13 -1
file modified
+33 -13