]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone
authorroot <root@sylvain-MacBookPro.(none)>
Thu, 29 Sep 2011 13:47:10 +0000 (15:47 +0200)
committerroot <root@sylvain-MacBookPro.(none)>
Thu, 29 Sep 2011 13:47:10 +0000 (15:47 +0200)

Trivial merge