[mediacapture-main] new commits pushed by burnburn

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

* changed AbortError from a MediaStreamError to a DOMException
  by Dan Burnett
https://github.com/w3c/mediacapture-main/commit/8d9e68b0393d2331752f488feb20e298a6ff1339

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

* Merge branch 'burnburn-aborterror'
  by Dan Burnett
https://github.com/w3c/mediacapture-main/commit/febf9bd0f9b3ec8f356b65245f7d2901a4334bb3

Received on Thursday, 18 June 2015 22:46:37 UTC