artemp a38b252ccd Merge branch 'master' into bigint ... Conflicts: plugins/input/geojson/geojson_datasource.cpp plugins/input/postgis/postgis_featureset.cpp		2012-12-18 13:57:39 +00:00
..
python	Merge branch 'master' into bigint	2012-12-18 13:57:39 +00:00