FS-6339 --resolve

Conflicts: libs/sofia-sip/.update

FS-6339 --resolve
Conflicts: libs/sofia-sip/.update
73b2894b · Anthony Minessale · 9495f253 · 73b2894b · 73b2894b
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
-Tue Feb 11 17:46:59 UTC 2014
+Tue Mar 11 18:17:52 CDT 2014
--- 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;
    }
  }