modified:   config.inc
	modified:   constants.inc
	modified:   gnp_buffer.inc
	modified:   gnp_misc.inc
	modified:   gtcm_gnp_class.inc
	modified:   tcp_socket.inc
Merge branch 'master' of https://github.com/dmheller/gtcm_gnp_client

Conflicts:
	inc/gtcm_gnp_class.inc