3.5.1 + oRTP/ZRTP branch merged

diff --git a/configure.ac b/configure.ac
index c2029267fd2d004a4938b0797f639784912800ab..05dc40e74d28751a8fe442351f61ea2ae40f2516 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([linphone],[3.5.0],[linphone-developers@nongnu.org])
+AC_INIT([linphone],[3.5.1],[linphone-developers@nongnu.org])
 AC_CANONICAL_SYSTEM
 AC_CONFIG_SRCDIR([coreapi/linphonecore.c])
 

diff --git a/oRTP b/oRTP
index a936749fac4d3e2f788a0c03b3c4ea2021b3ae13..f71b2073ae6c5254b03d30fe7ba05a490d09e785 160000 (submodule)
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit a936749fac4d3e2f788a0c03b3c4ea2021b3ae13
+Subproject commit f71b2073ae6c5254b03d30fe7ba05a490d09e785