Dane Springmeyer 71e7faed0d Merge branch 'master' of github.com:mapnik/mapnik into release/image_data_any
Conflicts:
	tests/python_tests/image_test.py
	tests/python_tests/image_tiff_test.py
	tests/visual_tests/images/tiff-opaque-edge-raster2-600-400-1.0-agg-reference.png
	tests/visual_tests/images/tiff-opaque-edge-raster2-600-400-2.0-agg-reference.png
2015-02-03 00:05:15 -08:00
..
2013-05-21 08:46:07 -07:00
2014-11-04 13:17:29 -05:00
2014-10-21 16:57:44 -07:00
2014-10-21 16:37:27 -07:00
2014-10-20 19:55:11 -07:00
2014-10-20 19:55:11 -07:00
2014-10-20 19:55:11 -07:00
2015-01-28 12:56:10 +01:00
run
2013-11-22 12:01:02 -08:00
2014-10-20 19:55:11 -07:00
2014-10-20 19:55:11 -07:00