Merge branch 'master' into retransmissions

lynckia · Jan 17, 2013 · 21d99a8 · 21d99a8
2 parents b5b8181 + 354d9b0
commit 21d99a8
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 541 deletions.
diff --git a/erizo_controller/test/public/erizo_on_jsep.js b/erizo_controller/test/public/erizo_on_jsep.js