Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui

Conflicts:
	Classes/LinphoneCoreSettingsStore.m
	submodules/linphone
This commit is contained in:
Yann Diorcet 2012-11-21 12:20:45 +01:00
commit eee32ec06f

@ -1 +1 @@
Subproject commit 2c5421f22e37952123d4cd06bf3b13da80a1e86f
Subproject commit 362d77908ae82c67eb61f5038ff048f9125984b5