Moises Silva d1b3c595cf Merge branch 'netborder' of git.sangoma.com:smg_freeswitch into netborder
Conflicts:
	libs/freetdm/mod_freetdm/mod_freetdm.c
	libs/freetdm/src/ftdm_state.c
2011-02-28 10:55:40 -05:00
..