contributors: partial sync to trunk

git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@70576 15284696-431f-4ddb-bdfa-cd5b030d7da7

contributors.csv

@@ -2,7 +2,7 @@ cvs_id,name,email,country,osgeo_id,rfc2_agreed
 -,Ivan Shmakov,<ivan theory.asu.ru>,Russia,1gray,yes
 -,Eric Patton,<epatton nrcan.gc.ca>,Canada,epatton,yes
 -,Laura Toma,<ltoma bowdoin.edu>,USA,ltoma,yes
--,Markus Metz,<markus_metz gmx.de>,Germany,mmetz,yes
+-,Markus Metz,<markus.metz.giswork googlemail.com>,Germany,mmetz,yes
 -,Maris Nartiss,<maris.gis gmail.com>,Latvia,marisn,yes
 -,Marco Pasetti,<marco.pasetti alice.it>,Italy,marcopx,yes
 -,Yann Chemin,<yann.chemin gmail.com>,Philippines,ychemin,yes
@@ -17,7 +17,7 @@ cvs_id,name,email,country,osgeo_id,rfc2_agreed
 -,Margherita Di Leo,<diregola gmail com>,Italy,madi,yes
 alex,Alex Shevlakov,<sixote yahoo.com>,Russia,-,-
 andreas,Andreas Lange,<andreas.c.lange gmx.de>,Germany,-,-
-benjamin,Benjamin Ducke,<benjamin.ducke ufg.uni-kiel.de>,Germany,benducke,yes
+benjamin,Benjamin Ducke,<benducke fastmail.fm>,Germany,benducke,yes
 bernhard,Bernhard Reiter,<bernhard intevation.de>,Germany,-,-
 bob,Bob Covill,<bcovill tekmap.ns.ca>,Canada,-,-
 brad,Brad Douglas,<rez touchofmadness.com>,USA,bdouglas,yes
@@ -37,6 +37,7 @@ jan,Jan-Oliver Wagner,<jan intevation.de>,Germany,-,-
 job,Job Spijker,<spijker geo.uu.nl>,Netherlands,-,-
 john,John Huddleston,<jhudd.lamar colostate.edu>,USA,-,-
 justin,Justin Hickey,<jhickey hpcc.nectec.or.th>,Thailand,-,-
+malcolm,Malcolm Blue,<mblue nb.sympatico.ca>,Canada,-,-
 markus,Markus Neteler,<neteler osgeo.org>,Italy,neteler,yes
 martin,Martin Wegmann,<wegmann biozentrum.uni-wuerzburg.de>,Germany,wegmann,yes
 martinl,Martin Landa,<landa.martin gmail.com>,Czech Republic,martinl,yes
@@ -51,7 +52,7 @@ paulo,Paulo Marcondes,<pmarc.debian gmail.com>,Brazil,pmarcondes,-
 pallech,Serena Pallecchi,<pallecch cli.di.unipi.it>,Italy,-,-
 radim,Radim Blazek,<radim.blazek gmail.com>,Czech Republic,rblazek,-
 roberto,Roberto Micarelli,<miro iol.it>,Italy,-,-
-robertoa,Roberto Antolin,<roberto geomatica.como.polimi.it>,Spain,rantolin,yes
+robertoa,Roberto Antolin,<rantolin.geo gmail.com>,Spain,rantolin,yes
 roger,Roger S. Miller,<rgrmill rt66.com>,USA,-,-
 scott,Scott Mitchell,<smitch mac.com>,Canada,smitch,yes
 soeren,Soeren Gebbert,<soerengebbert googlemail.com>,Germany,huhabla,yes

contributors_extra.csv

@@ -1,7 +1,7 @@
 name,email,country,rfc2_agreed
 Adam Laža,<ad.laza32 gmail.com>,Czech Republic,yes
-Alfonso Vitti,<alfonso vitti ing.unitn.it>,Italy,-
-Andrea Aime,<aaime openplans.org>,Italy,-
+Alfonso Vitti,<alfonso.vitti ing.unitn.it>,Italy,-
+Andrea Aime,<andrea.aime geo-solutions.it>,Italy,-
 Angus Carr,<apcarr flash.lakeheadu.ca>,Canada,-
 Antonio Galea,<antonio.galea gmail.com>,Italy,-
 Aldo Clerici,<aldo.clerici unipr.it >,Italy,-
@@ -26,17 +26,16 @@ Jarrett Keifer,<jkeifer0 gmail.com>,USA,-
 Jaro Hofierka,<jhofierka gmail.com>,Slovakia,-
 Jeshua Lacock,<jeshua OpenOSX.com>,USA,-
 Lars Ahlzen,<lars ahlzen.com>,-,-
-Lorenzo Moretti,<lorenzo moretti bologna.enea.it>,Italy,-
+Lorenzo Moretti,<lorenzo.moretti bologna.enea.it>,Italy,-
 Lubos Mitas,<lmitas unity.ncsu.edu>,USA,-
 Ludmila Furtkevicova,<ludmilafurtkevicov gmail.com>,Slovakia,-
-Malcolm Blue,<mblue nb sympatico.ca>,Canada,-
 Marco Vizzari,<marco.vizzari unipg.it>,Italy,-
 Maria Brovelli,<maria.brovelli polimi.it>,Italy,-
 Maurizio Cingi,<?>,Italy,-
 Michael Perdue,<michael_perdue yahoo.ca>,-,-
 Milena Nowotarska,<do.milenki gmail com>,PL,yes
 Otto Dassau,<otto.dassau gmx.de>,Germany,yes
-Philip Warner,<pjw rhyme com.au>,Australia,-
+Philip Warner,<pjw rhyme.com.au>,Australia,-
 Phisan Santitamnont,<fsvpss eng.chula.ac.th>,Thailand,-
 Pierre de Mouveaux,<pierre polaris-technologies.com>,-,-
 Ralf Gerlich,<ralf.gerlich bsse.biz>,-,-
@@ -44,7 +43,7 @@ Richard Roger,<richard.roger water.nsw.gov.au>,Australia,-
 Rob Parsons,<jrobparsons gmail.com>,USA,-
 Robert Kuszinger,<kuszinger giscom.hu>,Hungary,yes
 Roberto Flor,<flor fbk.eu>,Italy,-
-Roger Bivand,<Roger Bivand nhh.no>,Norway,-
+Roger Bivand,<roger.bivand nhh.no>,Norway,-
 Roger Miller,<rgrmill rt66.com>,-,-
 Sebastiaan Couwenberg,<sebastic xs4all.nl>,Netherlands,-
 Stephanie Wendel,<sawendel ncsu.edu>,USA,-