Use thread safe GEOS API (requires GEOS >= 3.1.0) (#4738)
cosmetic build/ignores/CI changes
Small fix for 4540 in empty maps
restore check for layer->maxfeatures (#4730)
Merge pull request #4739 from jlarouche/4540-fix2

Small fix for #4540 in empty maps
Fix 'separated' spelling

source: http://anonscm.debian.org/gitweb/?p=pkg-grass/mapserver.git;a=blob;f=debian/patches/shp2img-typo.patch

(found by @sebastic)
fix doc on cmake separator (#4741)

closes #4741
align parameter not saved (#3057)
Merge branch 'branch-6-2'
Add 'shptreetst' executable to cmake build
Install 'scalebar' and 'legend' executables
Merge pull request #4744 from fredj/scalebar_install

Install 'scalebar' and 'legend' executables (#4744)
Merge branch 'fredj-shptreetst_build'

Conflicts:
	CMakeLists.txt
update version string for beta2
add missing entries in 6.4 history
expand clipping rectangle to account for offset (#4554)

also adresses cleaner defines for single-sided offsets from #4716
rename cmake WITH_THREADS to WITH_THREAD_SAFETY
escape backslashes in mapfile string writer (#4747)
Merge pull request #4747 from tbonfort/b4747-backslash-escaping

Double backslashes in Windows UNC pathnames should be escaped by the mapfile writer
Install Ruby mapscript with CMake