Arnaldo Pereira 3dc8d5b09a Merge branch 'master' into arnaldo.ftdm_channel_read_event
Conflicts:

	libs/freetdm/src/ftdm_io.c
	libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
2010-12-01 20:34:02 -02:00
..
2010-10-06 17:51:29 -03:00