Merge branch 'master' into tunnel

This commit is contained in:
Jehan Monnier 2011-05-19 14:57:50 +02:00
commit 003961a94e

View file

@ -27,5 +27,6 @@ nortp_timeout=30
playback_dev_id=AU: Audio Unit Receiver
ringer_dev_id=AU: Audio Unit Speaker
capture_dev_id=AU: Audio Unit Receiver
echocancellation=0