Conflicts:
	src/mod/endpoints/mod_sofia/mod_sofia.h
	src/mod/endpoints/mod_sofia/sofia.c
	src/mod/endpoints/mod_sofia/sofia_presence.c
	src/mod/endpoints/mod_sofia/sofia_reg.c