Merge branch 'master' into csv_plugin

This commit is contained in:
Dane Springmeyer 2011-10-11 18:13:43 -07:00
commit 105649d299

View file

@ -1,9 +1,10 @@
## Mapnik Contibutors
Mapnik was written by Artem Pavlenko with contributions from:
Mapnik is written by Artem Pavlenko with contributions from:
Andy Allen
AJ Ashton
Matt Amos
Lucio Asnaghi
Justin Bronn
Christopher Brown
@ -32,7 +33,6 @@ Tom MacWright
Michal Migurski
Andrii Mishkovskyi
Ben Moores
Ben Moores
Dražen Odobašić
Cameron Patrick
Igor Podolskiy