]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone
author= <=>
Thu, 6 Oct 2011 06:57:27 +0000 (08:57 +0200)
committer= <=>
Thu, 6 Oct 2011 06:57:27 +0000 (08:57 +0200)

Trivial merge