merge from trunk r11000:11050

git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@11134 c8812cc2-4d05-0410-92ff-de0c093fc19c

AUTHORS

@@ -37,3 +37,4 @@ Peter Ersts	<ersts at amnh.org>
 Borys Jurgiel	<borysiasty at aster.pl>
 Paolo Cavallini	<cavallini at faunalia.it>
 Carson J. Q. Farmer	<carson dot farmer at gmail dot com>
+Lorenzo Masini	<lorenxo86@gmail.com>

CMakeLists.txt

@@ -384,7 +384,7 @@ ENDIF (ENABLE_TESTS)
 #############################################################
 # install stuff
 
-INSTALL (FILES AUTHORS SPONSORS TRANSLATORS INSTALL CODING
+INSTALL (FILES AUTHORS SPONSORS DONORS TRANSLATORS INSTALL CODING
          DESTINATION ${QGIS_DATA_DIR}/doc)
 
 # manual page - makes sense only on unix systems

DONORS

@@ -12,50 +12,53 @@
 #
 # ALWAYS USE UTF-8 WHEN WRITING THIS FILE!
 #
-Aaron Racicot, Ecotrust|www.ecotrust.org 
+Aaron Racicot, Ecotrust|http://www.ecotrust.org/ 
 Adam Lane
-Albin Blaschka|www.albinblaschka.info 
-Alessandro Pasotti|www.itopen.it  
+Albin Blaschka|http://www.albinblaschka.info/ 
+Alessandro Pasotti|http://www.itopen.it/  
 Alessandro Sarretta
 Alexandre Leroux
+Associazione Monte Porzio Cultura
 Carl Nelson
-D R Arbib|Unknown  
-David Enns|www.mapitout.com 
-Ecotrust|www.ecotrust.org
+D R Arbib  
+David Enns|http://www.mapitout.com/ 
+Ecotrust|http://www.ecotrust.org/
 Ferdinando Urbano
 Flavio Rigolon
 Fred Watchorn
-Glasic S.r.l.|www.glasic.it  
-Ivan Marchesini|www.gfosservices.it 
+Glasic S.r.l.|http://www.glasic.it/  
+Ivan Marchesini|http://www.gfosservices.it/ 
 James Crone
 Jaroslaw Kowalczyk
 Jason Jorgenson
 John C. Tull
-Kanton Solothurn|SOGIS
+Kanton Solothurn SOGIS
 Kevin Shook
 Laura Burnette
-Lorenzo Becchi|ominiverdi.org  
+Lorenzo Becchi|http://ominiverdi.org/  
 Luca Casagrande
 Maciej Sieczka
 Maria Antonia Brovelli
 Marc Monnerat
-Massimo Cuomo|www.acsys.it  
-Mateusz Loskot|mateusz.loskot.net 
+Massimo Cuomo|http://www.acsys.it/  
+Mateusz Loskot|http://mateusz.loskot.net/ 
 Matt Wilkie
-Niccolo Rigacci|www.rigacci.org  
+Niccolo Rigacci|http://www.rigacci.org/  
+Nikolaos Alexandris
 Otto Dassau
-Paolo Cavallini|www.faunalia.it  
-Paolo Cavallini|www.gfoss.it  
+Paolo Cavallini|http://www.faunalia.it/  
+Paolo Cavallini|http://www.gfoss.it/  
 Patti Giuseppe
-Planetek Italia s.r.l|www.planetek.it  
-Ragnvald Larsen|www.mindland.com 
+Planetek Italia s.r.l|http://www.planetek.it/  
+Radoslaw Pasiok
+Ragnvald Larsen|http://www.mindland.com/ 
 Raymond Warriner
 Silvio Grosso
-Stefano Menegon|www.mpasol.it  
+Stefano Menegon|http://www.mpasol.it/  
 Stephan Holl
 Sti Sas Di Meo
 Thierry Gonon
 Tim Baggett
 Tishampati Dhar
-Tyler Mitchell|spatialguru.com  
+Tyler Mitchell|http://spatialguru.com/  
 Yves Jacolin