]> git.ipfire.org Git - thirdparty/freeswitch.git/commit
FS-6085 --resolve
authorAnthony Minessale <anthm@freeswitch.org>
Tue, 28 Jan 2014 16:55:56 +0000 (21:55 +0500)
committerAnthony Minessale <anthm@freeswitch.org>
Tue, 28 Jan 2014 16:56:47 +0000 (21:56 +0500)
commit76fad9701df65279424ee0d68a688fff5d1e300e
tree459e080ef778068c3c7e9b7f40e9fe69927c9b2a
parent7bff57c5281ba79312790c88e26841b0edd88a60
FS-6085 --resolve

Conflicts:
src/mod/endpoints/mod_sofia/sofia_presence.c
src/mod/endpoints/mod_sofia/sofia_presence.c