Merge pull request #47 in FS/freeswitch from ~FLAVIO/freeswitch-fs-5106:master to...

* commit '56535519043201c723467c66c772d7519a2b6f62':
  FS-5106 fire an event when a sip client doesn't respond to option-ping

diff --cc src/mod/endpoints/mod_sofia/mod_sofia.c
Simple merge

diff --cc src/mod/endpoints/mod_sofia/mod_sofia.h
Simple merge

diff --cc src/mod/endpoints/mod_sofia/sofia.c
Simple merge

diff --cc src/mod/endpoints/mod_sofia/sofia_glue.c
Simple merge

diff --cc src/mod/endpoints/mod_sofia/sofia_reg.c
Simple merge