Merge branch 'master' into tunnel

Conflicts:
	linphone.xcodeproj/project.pbxproj

Classes/LinphoneUI/LinphoneManager.m

@@ -646,19 +646,17 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach
 											  otherButtonTitles:nil ,nil];
 		[error show];
 	}
-	/*IOS specific*/
-	linphone_core_start_dtmf_stream(theLinphoneCore);
-	
+
 	
 }
 -(void) becomeActive {
-	if (theLinphoneCore == nil) {
+    /*IOS specific*/
+	linphone_core_start_dtmf_stream(theLinphoneCore);
+    if (theLinphoneCore == nil) {
 		//back from standby and background mode is disabled
 		[self	startLibLinphone];
-		
 	} else {
-		ms_message("becomming active, make sure we are registered");
-		linphone_core_start_dtmf_stream(theLinphoneCore);
+        ms_message("becomming active, make sure we are registered");
 		linphone_core_refresh_registers(theLinphoneCore);//just to make sure REGISTRATION is up to date
 		
 	}

linphone-Info.plist

@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.4.2</string>
+	<string>3.4.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.4</string>
+	<string>1.0.5</string>
 	<key>NSMainNibFile</key>
 	<string>PhoneMainView</string>
 	<key>UIApplicationExitsOnSuspend</key>