Backed out changeset d2e790e8bc8e (bug 1030945)
Backed out changeset 1437c48ae58d (bug 1030945) for introducing a new hazard, CLOSED TREE
Bug 1031372 - CSP parser should accept 127.0.0.1:* (r=sstamm)
Bug 1031259 - CSP: Should allow external loads if no matching directive and no default-src is defined (r=sstamm)
Backed out 4 changesets (bug 1030446) for b2g non-unified build bustage on a CLOSED TREE

Backed out changeset d925c77d4b3f (bug 1030446)
Backed out changeset 988f19a5ea1f (bug 1030446)
Backed out changeset 6e87a7cf7eac (bug 1030446)
Backed out changeset 1c761a455bbf (bug 1030446)
Bug 1031349 - Fix the forward declaration of MP4Sample in WMFMediaDataDecoder.h; r=cpearce
Merge m-c to inbound a=merge
Bug 1031500: Increase number of buffers for webrtc OMX H.264 decode r=sotaro
Bug 997604 - Add invalidation rect support to ImageWrappers, and use it in nsImageFrame. r=tn,sr=bz

--HG--
extra : rebase_source : a0b0f79c2bfab604f13e1098d09b2ec61e578a37
Bug 1030446 - Move AsmJSFrameIterator to its own file (r=dougc)
Bug 1030446 - Change asm.js tests to use setJitCompilerOption instead of looping a bunch (r=bbouvier)
Bug 1030446 - Store and use exit-fp instead of exit-sp for asm.js stack unwinding (r=dougc)
Bug 1030446 - Build a list of code ranges and use this instead of CallSite for describing functions (r=dougc)
Bug 997010 (Part 1) - Support dynamic changes to the image-orientation property. r=dbaron
Bug 997010 (Part 2) - Reftest for dynamic changes to the image-orientation property. r=dbaron
Bug 1031542: Add test case for key usage without any value bits, r=keeler

--HG--
extra : rebase_source : 25bdc0db6b042fe6fbba61b80cb8a4ac7cb588eb
Bug 1031165 - Fix non-unified OS X build's warnings-as-errors in gfx/layers. r=bjacob
Bug 1031166 - Fix non-unified OS X build's warnings-as-errors in toolkit/components/places. r=mak
Bug 1031167 - Fix non-unified OS X build's warnings-as-errors in tools/profiler. r=BenWa
Bug 1028438 - Remove dummy --enable-privilege option from remotereftest.py. r=ted