]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone
author= <=>
Fri, 30 Sep 2011 13:29:02 +0000 (15:29 +0200)
committer= <=>
Fri, 30 Sep 2011 13:29:02 +0000 (15:29 +0200)

Trivial merge