Merge branch 'branch-6-2' into branch-6-4 · MapServer/MapServer@fb41883 · GitHub

Commit

Merge branch 'branch-6-2' into branch-6-4

Browse files

Conflicts:
	.travis.yml
	HISTORY.TXT
	mapserver.h

Loading branch information

tbonfort committed Jan 2, 2014

2 parents d44431a + 4186abc commit fb41883