Hermann Kraus 406904a1f6 Merge branch 'master' into harfbuzz ... Conflicts: bindings/python/mapnik/__init__.py include/mapnik/font_engine_freetype.hpp src/load_map.cpp		2012-09-15 01:39:33 +02:00
..
python	Merge branch 'master' into harfbuzz	2012-09-15 01:39:33 +02:00