]> sjero.net Git - linphone/commit
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone
authorSimon Morlat <simon.morlat@linphone.org>
Thu, 2 Jun 2011 09:47:59 +0000 (11:47 +0200)
committerSimon Morlat <simon.morlat@linphone.org>
Thu, 2 Jun 2011 09:47:59 +0000 (11:47 +0200)
commit979abad9052348c3a87c2976b18bf5eeb8c450c6
tree2923bb7550a1e4203cb171cb7f5efc363153965d
parent327e154dba1451447d00a977f408077215524486
parentc097b9ab6319e2a7ef758032c0ed6d41e009bedb
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone

Conflicts:
mediastreamer2