]> sjero.net Git - linphone/commit
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone
authorSimon Morlat <simon.morlat@linphone.org>
Tue, 23 Aug 2011 13:46:21 +0000 (15:46 +0200)
committerSimon Morlat <simon.morlat@linphone.org>
Tue, 23 Aug 2011 13:46:21 +0000 (15:46 +0200)
commit6209a0b32269f4f5841791f4c8e01b16e28f4151
tree6fbe34973a062f7fd4e38c7a320ba5404779487a
parentc396b74b9b9d2017bf31d8a0b95c092a767eb58e
parenta1b315393998fc356a23267d048aaf4578a0988c
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone

Conflicts:
mediastreamer2