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
..
2012-08-27 16:43:40 -07:00
2012-11-29 10:35:03 +00:00
2012-12-14 10:01:21 +00:00
2012-02-01 17:37:35 -08:00