artemp c4bae9d30a Merge branch 'master' into bigint
Conflicts:
	bindings/python/mapnik_feature.cpp
	plugins/input/shape/dbfile.cpp
2012-12-14 10:01:21 +00:00
..
2012-08-27 16:43:40 -07:00
2012-04-08 02:20:56 +02:00
2012-04-08 02:20:56 +02:00
2011-11-13 19:54:32 -08:00
2012-08-08 16:15:54 +01:00
2012-08-24 13:49:28 -07:00
2012-08-24 13:49:28 -07:00
2012-04-08 02:20:56 +02:00
2012-04-08 02:20:56 +02:00