Bug 1011024 - Fix nsScriptSecurityManager::GetChannelPrincipal so that it doesn't fail to get the correct nsIPrincipal for some resource documents. r=bz
Bug 844779 - Revert 19eafdcdefe3 for SPS-related breakage r=me
Bug 1001623 - clean up error handling of index returning methods, r=tbsaunde
Bug 1008668 - Make Qt port compile on 5.0.2. r=romaxa DONTBUILD
Bug 996785 - Allow multiple JS finalize callbacks (r=jonco)
Bug 996785 - Move global CPOW functions to top level (r=mrbkap)
Bug 996785 - Rename CPOW object map (r=mrbkap)
Bug 996785 - Rename CPOW findObject (r=mrbkap)
Bug 996785 - Rename CPOW toValue (r=mrbkap)
Bug 996785 - Rename CPOW makeId/unwrap (r=mrbkap)
Bug 996785 - Use separate maps for local and remote CPOW objects (r=mrbkap)
Bug 996785 - Move CPOW wrapper owner code (r=mrbkap)
Bug 996785 - Move CPOW wrapper answering code (r=mrbkap)
Bug 996785 - Use more descriptive IPDL types for CPOW value variants (r=mrbkap)
Bug 996785 - Distinguish local and remote CPOW objects in IPDL (r=mrbkap)
Bug 996785 - Fix existing CPOW uses to prepare for weak references (r=mrbkap)
Bug 996785 - Bidirectional CPOWs (r=mrbkap)
Bug 996785 - Fix CPOW wrapping and compartment ownership (r=mrbkap)
Bug 996785 - New CPOW tests for bidirectionality and Xray behavior (r=mrbkap)
Merge m-c to inbound