Hermann Kraus 1e6e2bdaa7 Merge branch 'master' into harfbuzz ... Conflicts: bindings/python/mapnik/__init__.py		2012-09-23 13:28:08 +02:00
..
python	Merge branch 'master' into harfbuzz	2012-09-23 13:28:08 +02:00