artemp ea28abf203 Merge branch 'master' into image-readers-c++11 ... Conflicts: bindings/python/mapnik_image.cpp include/mapnik/factory.hpp include/mapnik/image_reader.hpp src/image_reader.cpp src/jpeg_reader.cpp src/png_reader.cpp		2013-04-22 12:24:09 +01:00
..
input	Merge branch 'master' into image-readers-c++11	2013-04-22 12:24:09 +01:00