[mediacapture-main] new commits pushed by burnburn

The following commits were just pushed by burnburn to 
https://github.com/w3c/mediacapture-main:

* changed NotSupportedError from a MediaStreamError to a DOMException
  by Dan Burnett
https://github.com/w3c/mediacapture-main/commit/2fe321f63629d2efa1425c5d80bf6d0b0b1a1039

* fixed merge conflict
  by Dan Burnett
https://github.com/w3c/mediacapture-main/commit/eac44f6db5f3cd3302d4a10d4a6c7ed62be39117

* corrected AbortError->DOMException
  by Dan Burnett
https://github.com/w3c/mediacapture-main/commit/e230720d6b3e694a8a0ae4618e910bac8901b895

* Merge branch 'burnburn-notsupportederror'
  by Dan Burnett
https://github.com/w3c/mediacapture-main/commit/2e9c92353b47afc776b589b5a509b8f315a4cbf2

Received on Thursday, 18 June 2015 23:09:11 UTC