From: Moises Silva <moy@sangoma.com>
Date: Tue, 17 May 2011 23:57:49 +0000 (-0400)
Subject: Merge remote-tracking branch 'smgfs/master'
X-Git-Tag: v1.2-rc1~118^2~6^2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b59756edd6a75a6eba0e530671a1eb5d94825ef;p=thirdparty%2Ffreeswitch.git

Merge remote-tracking branch 'smgfs/master'

Conflicts:
	libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c
---

0b59756edd6a75a6eba0e530671a1eb5d94825ef
diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c
index edad62fc0d,f4fee712c9..3ba776928d
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c
@@@ -1128,9 -1108,9 +1131,9 @@@ ftdm_bearer_cap_t sngisdn_get_infoTranC
  {
  	switch(bearer_capability) {
  	case IN_ITC_SPEECH:
 -		return FTDM_BEARER_CAP_SPEECH;		
 +		return FTDM_BEARER_CAP_SPEECH;
  	case IN_ITC_UNRDIG:
- 		return FTDM_BEARER_CAP_64K_UNRESTRICTED;
+ 		return FTDM_BEARER_CAP_UNRESTRICTED;
  	case IN_ITC_A31KHZ:
  		return FTDM_BEARER_CAP_3_1KHZ_AUDIO;
  	default: