Bug 1000675.  Don't always include nsContentUtils in example codegen, fix example header guards to not end with __, don't use fully-qualified names in argument types when those argument types are in the mozilla::dom namespace already, and include headers from mozilla/dom.  r=jst
Bug 1000944.  Allow unions and dictionaries that contain non-SpiderMonkey WebIDL interface types to be copy-constructed.  r=dzbarsky
Bug 942121.  Fix WebIDL dictionary member tracing to null-check nullable object types before trying to trace them, since passing pointer-to-null to JS_CallObjectTracer is not OK.  r=smaug
Bug 1001708: Don't use ternary operator with class const statics r=jesup
Bug 940329: avoid warnings from using size_t in ImplCycleCollectionTraverse() r=ehsan
Bug 940329: fix spammy implicit type-conversion warnings in nsTSubstring.h r=ehsan
Backed out changeset 18034a2d0732 (bug 940329) for build bustage
Bug 959209 - Thunderbird should use toolkit autocomplete widget, not the XPFE one. r=neil
Bug 1001936 - Clear the value cache when the editor is being destroyed because it won't get updated when we don't have a bound frame; r=bzbarsky
Bug 997805 - Correctly restore the placeholder text after the editor object is re-attached to a text control as a result of a reframe; r=bzbarsky

Recomputing the placeholder visibility does not require the placeholder div
itself to be present, as the only information required for that is the current
value of the text control which is present either way.  This patch fixes
nsTextEditorState::ValueWasChanged and nsTextEditorState::UpdatePlaceholderVisibility
to that effect.

But the real fix is in nsTextEditorState::UpdatePlaceholderText, where after
setting the placeholder text on the anonymous div, we redo the placeholder
visibility computation.  Since this function can be called from
HTMLTextAreaElement::CreatePlaceholderNode during frame construction, the
GetValue function may return the wrong value since the editor has not properly
been set up yet, resulting in this bug.  And this function call is useless
anyway, because changing the placeholder text does not really affect the
result of the visibility computation, so there is no need to do this work
in the first place.
Bug 1001842 part 1: record the umask in NS_InitXPCOM2 and expose it to JS via nsSystemInfo.  r=bsmedberg
Bug 1001842, part 2: make umask available via OS.Constants. r=khuey sr=bz
Bug 993029: Create an add-on console actor that will be displayed in the console tab of the add-on debugger. r=msucan, r=Unfocused
Bug 940329: avoid warnings from using size_t in ImplCycleCollectionTraverse() r=ehsan
Backed out changeset 61b922c31b12 (bug 993029)
Backed out 9 changesets (bug 987311, bug 989027, bug 989144). r=sheriff

Backed out changeset 046c061d91c2 (bug 989144)
Backed out changeset 3f1b41adeaef (bug 987311)
Backed out changeset 8d5a171564bd (bug 987311)
Backed out changeset dcc0d016de7a (bug 987311)
Backed out changeset 27f338fbc835 (bug 989027)
Backed out changeset 4a67f5144ea4 (bug 989027)
Backed out changeset 62ba0a377450 (bug 987311)
Backed out changeset 6a2542a5c865 (bug 987311)
Backed out changeset 1dfd9a457f34 (bug 987311)
Backed out 2 changesets (bug 987290). r=sheriff

Backed out changeset 4ad1f662f521 (bug 987290)
Backed out changeset 080ff1f86465 (bug 987290)
Merge b2g-inbound to m-c.
Merge fx-team to m-c.
Bug 986166 - Disable browser_dbg_variables-view-edit-click.js on Windows and OSX opt for frequent failures. r=vp