]> sjero.net Git - linphone/commit
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone
authorJehan Monnier <jehan.monnier@linphone.org>
Wed, 24 Nov 2010 09:13:19 +0000 (10:13 +0100)
committerJehan Monnier <jehan.monnier@linphone.org>
Wed, 24 Nov 2010 09:13:19 +0000 (10:13 +0100)
commit3bf340a4b8f30d016ad3bff4737a9a3d3e954b1f
tree56ec18f539ae491405f6b260f7c896d1e0fb07a5
parenteff38d7d194093def613c1b637eee04792cd3860
parent1a6849c10192ea39dd025524ca4e8d071246f3cd
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone

Conflicts:
mediastreamer2