]> sjero.net Git - linphone/commit
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone
authorSimon Morlat <simon.morlat@linphone.org>
Thu, 25 Aug 2011 21:38:27 +0000 (23:38 +0200)
committerSimon Morlat <simon.morlat@linphone.org>
Thu, 25 Aug 2011 21:38:27 +0000 (23:38 +0200)
commit4c90ccfeec6d3c5b481697ed6d5b87bd54a2d580
tree52dd86fd670a1ad9571e4c20538f4601ce7004bc
parent400b71a140ce9910439766cd850ecaa3636d287a
parent6b02a9e076623cf4e0147c660541560e016cb041
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone

Conflicts:
mediastreamer2