sofia update

216597c9 · Anthony Minessale · ca973e4c · 216597c9
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
+<<<<<<< HEAD
 Wed Feb 11 12:35:25 EST 2015
+=======
+<<<<<<< HEAD
+Wed Jan  7 11:24:56 PST 2015
+=======
+Tue Jan  6 20:12:24 CST 2015
+>>>>>>> sofia update
+>>>>>>> sofia update