Arnaldo Pereira f5a9adae92 Merge branch 'master' into netborder
Conflicts:

	libs/freetdm/src/ftdm_io.c
	libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c
	libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.h
	libs/freetdm/src/include/freetdm.h
2010-12-03 12:40:14 -02:00
..
2010-09-27 13:26:09 -05:00
2010-11-23 17:17:46 -08:00
2010-09-07 09:40:47 -05:00
2010-11-24 03:58:22 +00:00
2010-08-19 10:38:54 -05:00
2010-08-19 10:38:54 -05:00
2010-08-19 10:38:54 -05:00
2010-11-17 11:46:20 -06:00
2010-03-30 14:25:13 -04:00
2009-12-07 07:07:43 +00:00
2010-11-07 14:35:29 -06:00
2010-02-23 22:56:54 +00:00
2010-09-14 17:14:53 -07:00