Dane Springmeyer 48982c0619 Merge branch 'master' of github.com:mapnik/mapnik into release/image_data_any
Conflicts:
	tests/python_tests/image_tiff_test.py
2015-01-26 20:09:00 -08:00
..
2014-11-20 15:25:50 +01:00
2015-01-26 12:51:34 +01:00
2014-11-20 15:25:50 +01:00
2014-11-20 15:25:50 +01:00
2014-11-20 15:25:50 +01:00
2014-10-21 16:37:27 -07:00
2015-01-21 14:28:12 -08:00