Moises Silva 0b59756edd Merge remote-tracking branch 'smgfs/master'
Conflicts:
	libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c
2011-05-17 19:57:49 -04:00
..
2010-10-06 17:51:29 -03:00