sofia rebuild

libs/sofia-sip/.update

 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 Wed Feb 11 12:35:25 EST 2015
 =======
 =======
 >>>>>>> sofia rebuild
+=======
+>>>>>>> sofia rebuild
 <<<<<<< HEAD
 Wed Jan  7 11:24:56 PST 2015
 =======
@@ -15,4 +18,9 @@ Tue Jan  6 20:12:24 CST 2015
 =======
 Wed Jan  7 11:18:02 CST 2015
 >>>>>>> sofia rebuild
+<<<<<<< HEAD
+=======
+=======
+Mon Jan 12 11:34:52 CST 2015
+>>>>>>> sofia rebuild
 >>>>>>> sofia rebuild