Merge branch 'master' into arnaldo.zt_chan_next_event

author Arnaldo Pereira <arnaldo@sangoma.com>

Tue, 21 Dec 2010 16:16:45 +0000 (14:16 -0200)

committer Arnaldo Pereira <arnaldo@sangoma.com>

Tue, 21 Dec 2010 16:16:45 +0000 (14:16 -0200)
author Arnaldo Pereira <arnaldo@sangoma.com>
Tue, 21 Dec 2010 16:16:45 +0000 (14:16 -0200)
committer Arnaldo Pereira <arnaldo@sangoma.com>
Tue, 21 Dec 2010 16:16:45 +0000 (14:16 -0200)
diff --cc libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c
Simple merge
author	Arnaldo Pereira <arnaldo@sangoma.com>
	Tue, 21 Dec 2010 16:16:45 +0000 (14:16 -0200)
committer	Arnaldo Pereira <arnaldo@sangoma.com>
	Tue, 21 Dec 2010 16:16:45 +0000 (14:16 -0200)