Bug 960458 - cl.py doesn't properly parse showIncludes prefix on some localized versions. r=glandium
Backed out changeset 17220466f40b (bug 960458) for bustages on windows on a CLOSED TREE
Bug 957088 - Use && rather than and in #if directives r=terrence
Bug 961095 - Allow for the fact that the nsJSObjWrapper may be dead when postbarrier callback runs r=terrence
Bug 961095 - Improve generic callbacks with better typing, and by only adding storebuffer entries when the key is in the nursery r=terrence
Bug 961734 - reorder nsFont fields for slightly better packing; r=jfkthame
Bug 959999 Clean up nsTextStore::Initialize() r=jimm
Merge mozilla-central to mozilla-inbound
Bug 961761 - move to static_assert for JSJitInfo; r=efaust
Bug 924972 - Enforce the focus before running every subtest of test_reftests_with_caret.html
Bug 961054 - Don't invoke SetLastResult until the completion of an XPCWN method call. r=mrbkap
Bug 958324 - Remove same-compartment security wrappers for WNs. r=peterv,r=mrbkap

We've fixed Components, and SOWs are new-binding only. Youpie!
Bug 958324 - Remove SOW-transplant-related fixup. r=peterv

This became obsolete with bug 922009.
Backed out changeset 746018b05d67 (bug 924972) because of test failures
Bug 907196 - Split CreateCMSOutputProfile profile loading into GetCMSOutputProfileData. r=BenWa, r=jmuizelaar
Bug 941109 - use closemenu instead of noautoclose attribute in Australis menupanel, r=mconley

--HG--
extra : rebase_source : 89c32805249cebe4c29e135b1d27b7679eb1fbd8
Bug 932928 - [Australis] Show something when "More Tools" section is empty in customization mode. r=gijs
Bug 884851 - Replace the mIsAutoComplete boolean with an enum. r=kats
Merge m-c to fx-team.
Bug 960695 - Focus Input line when clicking anywhere in the console; r=msucan