FS-6339 --resolve

Conflicts:
	libs/sofia-sip/.update

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index 17456f2b20d517f8b398462212bc12783ae51e85..3fbe538663418dc557ee348ca22d5ddac60e43a8 100644 (file)
--- 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 763933b070e32a1b34eac6dde344ea7a1ddaa2d8..cba30bebaef390fee5d96f57abe2281e766b199d 100644 (file)
--- 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;
     }
   }