bug 887995 - allow nsiprotocolproxyservice::asyncresolve() to be called re-entrantly
bug 887995 - allow nsiprotocolproxyservice::asyncresolve() to be called re-entrantly r=jduell
Bug 883696 (part 1) - Include full paths in #include statements in js/src/ion/.  r=jandem.
Bug 816793: Include 32-bit mozconfig for linux desktop b2g builds. r=ted
Bug 816793: Backed out changeset e77346fbdff1 for bustage. r=bustage
Bug 883696 (part 2) - Include full paths in #include statements in js/src/{assembler,yarr}/.  r=luke.
Bug 883696 (part 3) - Include full paths in #include statements in js/src/jsapi-tests/.  r=luke.
Bug 883696 (part 4) - Include full paths in #include statements in the rest of js/src/ and js/public/.  r=luke.
Merge birch to m-c
Merge m-i to m-c
Merge m-c to m-i
Bug 887974 - CSP 'unsafe-eval' directive ignored (r=sstamm)