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
..
input	Merge branch 'master' of github.com:mapnik/mapnik into release/image_data_any	2015-01-26 20:09:00 -08:00