Fix bug in merge and in Makefile.am

src/plug-in/Makefile.am

 include ../../globals.mak
 
-SUBDIRS=audiorecorder
+SUBDIRS=audiorecorder test
 
 noinst_LTLIBRARIES = libplugin.la
 
-SUBDIRS=test
-
 libplugin_la_SOURCES = \
 		pluginmanager.cpp \
 		librarymanager.cpp

src/sipvoiplink.cpp

@@ -947,10 +947,6 @@ SIPVoIPLink::SIPCallServerFailure(SIPCall *call)
     //}
 }
 
-void
-SIPVoIPLink::SIPCallClosed(SIPCall *call) 
-{
-
 void
 SIPVoIPLink::SIPCallClosed(SIPCall *call) 
 {