From: Simon Morlat Date: Mon, 30 Jan 2012 21:22:24 +0000 (+0100) Subject: Merge branch 'master' of git.linphone.org:linphone into tunnel X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=31d68ac1ae9873e30e5604028e4d9e7d7778a326 Merge branch 'master' of git.linphone.org:linphone into tunnel --- 31d68ac1ae9873e30e5604028e4d9e7d7778a326