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
..
python	Merge branch 'master' of github.com:mapnik/mapnik into release/image_data_any	2015-02-03 00:05:15 -08:00