]> sjero.net Git - linphone/commit
Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone
authorJehan Monnier <jehan.monnier@linphone.org>
Mon, 13 Sep 2010 21:41:09 +0000 (23:41 +0200)
committerJehan Monnier <jehan.monnier@linphone.org>
Mon, 13 Sep 2010 21:41:09 +0000 (23:41 +0200)
commit55aa245f04845e8d1353cc0ac95dbe8ce176890b
tree4d4cc86e0f01c0ddfd92dea4bef95736744b4767
parentdfa388b30485965a8e10f9013551c6e63e6c3bb2
parentdbb43a0069afca8970e1c2aecdfc7bb3b1137b8e
Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone

Conflicts:
mediastreamer2