From: Jehan Monnier Date: Tue, 16 Nov 2010 07:46:05 +0000 (+0100) Subject: Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=3d4f548aac890eae150a1534c47fab1e0aad6c1c Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone --- 3d4f548aac890eae150a1534c47fab1e0aad6c1c