adam needs to merge webrtc pr 213

• From: Dan Burnett <dburnett@voxeo.com>
• Date: Wed, 6 May 2015 21:18:22 -0400
• To: public-webrtc-editors@w3.org
• Message-Id: <F97DA4B6-06F8-481B-A507-E4178F291B47@voxeo.com>

https://github.com/w3c/webrtc-pc/pull/213 shows merge conflicts that look straightforward but may not be.  Adam should review and do this merge.

-- dan

Received on Thursday, 7 May 2015 01:18:50 UTC