Merge branch 'master' into recording

sflphone-gtk/src/assistant.c

sflphone-gtk/src/assistant.h

src/Makefile.am

src/audio/audiortp.cpp

src/call.cpp

src/call.h

src/iaxcall.cpp

src/iaxcall.h

src/sdp.cpp

src/sdp.h

src/sdpmedia.cpp

src/sdpmedia.h

src/sipcall.cpp

src/sipcall.h

src/sipvoiplink.cpp

src/sipvoiplink.h

src/user_cfg.h