Conflicts:
	sflphone-client-gnome/pixmaps/Makefile.am
	sflphone-client-gnome/src/Makefile.am
	sflphone-client-gnome/src/actions.h
	sflphone-client-gnome/src/contacts/calltree.c
	sflphone-client-gnome/src/dbus/callmanager-introspec.xml
	sflphone-client-gnome/src/dbus/dbus.c
	sflphone-common/src/Makefile.am
	sflphone-common/src/audio/Makefile.am
	sflphone-common/src/audio/alsalayer.cpp
	sflphone-common/src/audio/audiolayer.h
	sflphone-common/src/audio/audiortp.cpp
	sflphone-common/src/audio/audiortp.h
	sflphone-common/src/audio/codecDescriptor.h
	sflphone-common/src/audio/pulselayer.cpp
	sflphone-common/src/audio/pulselayer.h
	sflphone-common/src/dbus/callmanager.h
	sflphone-common/src/iaxvoiplink.cpp
	sflphone-common/src/iaxvoiplink.h
	sflphone-common/src/managerimpl.cpp
	sflphone-common/src/managerimpl.h
	sflphone-common/src/sdp.cpp
	sflphone-common/src/sipcall.cpp
	sflphone-common/src/sipcall.h
	sflphone-common/src/sipvoiplink.cpp
	sflphone-common/src/sipvoiplink.h
	sflphone-common/test/Makefile.am

Merge branch 'master' of git+ssh://repos-sflphone-git@git.sflphone.org/var/repos/sflphone/git/sflphone

Instanciate AudioCodec for each rtp session

to parse the attribute line as defined in RFC4568. Still need to support
multiple inline: fields and multiple session-params. Added testing file
for the SdesNegotiator class. Still need to write proper unit tests.

operators were added. Temporary testRegex.cpp file added for testing purposes.
Still needs to write unit tests for this class. This file will be removed
soon.

for SDES/RFC4568 parsing.

server yet. Still a stub.

configuration dialog