Hermann Kraus e380a20b6c Merge branch 'master' into harfbuzz ... Conflicts: src/symbolizer_helpers.cpp		2012-08-05 16:29:09 +02:00
..
mapnik	Merge branch 'master' into harfbuzz	2012-08-05 16:29:09 +02:00