Conflicts:

	src/audio/audiortp.cpp
	src/sipvoiplink.cpp

Conflicts:

	src/audio/audiortp.cpp
	src/sipvoiplink.cpp

Conflicts:

	src/audio/audiortp.cpp
	src/sipvoiplink.cpp

Conflicts:

	configure.ac
	src/Makefile.am
	src/audio/alsalayer.cpp
	src/audio/audiortp.cpp

Conflicts:

	configure.ac
	src/Makefile.am

Conflicts:

	src/plug-in/plugininterface.h
	src/plug-in/test/pluginTest.cpp
	test/pluginmanagerTest.cpp

Conflicts:

	src/sipvoiplink.cpp

Conflicts:

	src/audio/audiortp.cpp
	src/sipvoiplink.cpp

Remove namespace

Conflicts:

	src/audio/audiortp.cpp
	src/iaxvoiplink.cpp
	src/sipvoiplink.cpp
	src/sipvoiplink.h
	src/voiplink.h