From: Anthony Minessale <anthm@freeswitch.org>
Date: Tue, 11 Mar 2014 23:16:23 +0000 (-0500)
Subject: FS-6339 --resolve
X-Git-Tag: v1.2.23~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73b2894b05cf076bf05e25bfa1e283e372491ddd;p=thirdparty%2Ffreeswitch.git

FS-6339 --resolve

Conflicts:
	libs/sofia-sip/.update
---

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index 17456f2b20..3fbe538663 100644
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Tue Feb 11 17:46:59 UTC 2014
+Tue Mar 11 18:17:52 CDT 2014
diff --git a/libs/sofia-sip/libsofia-sip-ua/nta/nta.c b/libs/sofia-sip/libsofia-sip-ua/nta/nta.c
index 763933b070..cba30bebae 100644
--- a/libs/sofia-sip/libsofia-sip-ua/nta/nta.c
+++ b/libs/sofia-sip/libsofia-sip-ua/nta/nta.c
@@ -11055,7 +11055,6 @@ nta_reliable_t *reliable_find(nta_agent_t const *agent,
 	if (rel->rel_rseq == rack->ra_response)
 	  return (nta_reliable_t  *)rel;
 
-      return NULL;
     }
   }