]> sjero.net Git - linphone/commit
Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone
authorGuillaume Beraudo <guillaume.beraudo@linphone.org>
Fri, 21 Jan 2011 15:16:54 +0000 (16:16 +0100)
committerGuillaume Beraudo <guillaume.beraudo@linphone.org>
Fri, 21 Jan 2011 15:16:54 +0000 (16:16 +0100)
commit841c6942d39f322132376ef3fb24a53c743e2660
treef8fe64e973c7b433b27eaf36da86e0d42e32991d
parent3f6e745654ba7e9d464b5f32ed27af2d0af2729b
parentfa1e4658bde1b9b3f7abc8745db71d15287694e3
Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone

Conflicts:
mediastreamer2