]> sjero.net Git - linphone/commitdiff
Merge branch 'edge'
authorGhislain MARY <ghislain.mary@belledonne-communications.com>
Fri, 7 Sep 2012 07:08:49 +0000 (09:08 +0200)
committerGhislain MARY <ghislain.mary@belledonne-communications.com>
Fri, 7 Sep 2012 07:08:49 +0000 (09:08 +0200)

Trivial merge