Konstantin Käfer 13c46b6cc6 Merge branch 'master' into conv_simplify
Conflicts:
	bindings/python/mapnik_line_symbolizer.cpp
	bindings/python/mapnik_polygon_symbolizer.cpp
2012-08-24 23:29:43 +02:00
..
2012-04-08 02:20:56 +02:00
2012-04-08 02:20:56 +02:00
2012-07-24 19:08:15 -07:00
2011-11-13 19:54:32 -08:00
2012-04-08 02:20:56 +02:00
2012-04-08 02:20:56 +02:00
2012-08-08 16:15:54 +01:00
2012-04-08 02:20:56 +02:00
2012-07-06 18:39:59 -07:00
2012-04-08 02:20:56 +02:00
2012-04-08 02:20:56 +02:00