Hermann Kraus 1dba0581c2 Merge branch 'master' into harfbuzz ... Conflicts: src/cairo_renderer.cpp		2012-08-12 12:32:35 +02:00
..
python	Merge branch 'master' into harfbuzz	2012-08-12 12:32:35 +02:00