[qgis/f17: 6/6] Merge branch 'master' into f17

[Volker Fröhlich]

commit 9eb4c6e16cbc4bdf87b8f6692da501d896af068d
Merge: d520261 cf419dc
Author: Volker Fröhlich <volker27 at gmx.at>
Date:   Thu Jul 19 00:01:09 2012 +0200

    Merge branch 'master' into f17

 qgis-1.8.0-datasource-crash.patch |   37 ++++++++++++++++++++++++++++++++++
 qgis-1.8.0-sip410.patch           |   40 +++++++++++++++++++++++++++++++++++++
 qgis.spec                         |   29 +++++++++++++++++++++++++-
 3 files changed, 104 insertions(+), 2 deletions(-)
---