From: Michael Jerris <mike@jerris.com>
Date: Tue, 29 Jan 2008 21:15:25 +0000 (+0000)
Subject: whoops from merge conflict
X-Git-Tag: v1.0-rc1~489
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2af068acfeae578a32d9456ff367f726c11af9b;p=thirdparty%2Ffreeswitch.git

whoops from merge conflict

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7430 d0543943-73ff-0310-b7d9-9358b9ac24b2
---

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index b6492828e9..0faf16f242 100644
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Sat Jan 26 14:48:35 EST 2008
+Tue Jan 29 16:15:12 EST 2008
diff --git a/libs/sofia-sip/libsofia-sip-ua/su/su_root.c b/libs/sofia-sip/libsofia-sip-ua/su/su_root.c
index b17ef400e0..86c8b5d168 100644
--- a/libs/sofia-sip/libsofia-sip-ua/su/su_root.c
+++ b/libs/sofia-sip/libsofia-sip-ua/su/su_root.c
@@ -1049,7 +1049,6 @@ void su_msg_destroy(su_msg_r rmsg)
   su_msg_t *msg;
 
   assert(rmsg);
-  rmsg[0] = NULL;
 
   msg = rmsg[0], rmsg[0] = NULL;