Bug 999753 - Add support for starting B2G desktop build with -oop
Merge pull request #49 from evanxd/bug-999753

Bug 999753 - Add support for starting B2G desktop build with -oop
Upgrade to marionette-js-runner@0.5.2
Merge pull request #50 from gaye/ochameau-custom-gecko

Upgrade to marionette-js-runner@0.5.2
Bug 1035241 - Update mail-fakeservers to 0.0.19 to enable gaia XULRunner upgrade to version 33.
Merge pull request #51 from asutherland/bug1035241

Bug 1035241 - Update mail-fakeservers to 0.0.19 to enable gaia XULRunner upgrade to version 33. r=kgrandon
Bug 1033221 - make mozilla-download and mozilla-get-url timeout in case the FTP server doesn't answer r=me
Merge pull request #52 from julienw/1033221-update-mozilla-download

Bug 1033221 - make mozilla-download and mozilla-get-url timeout in case ...
Bug 1005707 - Intermittent test suite failures, TypeError: Cannot read property 'deleteSession' of null
Bug 1037033 - Update node modules for, add ability to annotate manifest tests in blacklist
Bug 1033858 - Update marionette-js-runner for bump to marionette-js-logger
Bug 921050 - Update mail-fakeservers to v20 for [Send email in the background]. r=asuth
Merge pull request #53 from mozilla-b2g/mail-fakeservers-20

Bug 921050 - Update mail-fakeservers to v20 for [Send email in the backg...
Upgrade chai to 1.9.1 to downstream assert.notInclude
Merge pull request #55 from gaye/chai-assert-not-include

Upgrade chai to 1.9.1 to downstream assert.notInclude
Bug 1037089 - Add corredor-js, marionette-socket-host and mocha-socket-reporter to gaia-node-modules, r=gaye
Add instructions for testing changes pre-merge
Merge pull request #54 from ahal/add_socket_repos

Bug 1037089 - Add corredor-js, marionette-socket-host and mocha-socket-r...
Revert "Bug 1037089 - Add corredor-js, marionette-socket-host and mocha-socket-r..."
Merge pull request #56 from mozilla-b2g/revert-54-add_socket_repos

Revert "Bug 1037089 - Add corredor-js, marionette-socket-host and mocha-...