From 38edecafcb11416ac02d4b3e5b1cb5393edd1073 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Date: Tue, 14 Feb 2012 11:02:22 +0100
Subject: [PATCH] 3.5.1 + oRTP/ZRTP branch merged

---
 configure.ac | 2 +-
 oRTP         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index c2029267f..05dc40e74 100644
--- 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 a936749fa..f71b2073a 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit a936749fac4d3e2f788a0c03b3c4ea2021b3ae13
+Subproject commit f71b2073ae6c5254b03d30fe7ba05a490d09e785