Bug 1102177 - Don't apply a fixed height to <hr> elements. r=dbaron
Merge mozilla-central to mozilla-inbound
Bug 116083 - Correctly handle the whitespace in all preformatted elements; r=roc

Previously this code only handled the special case of a <body> element that
had an explicit style attribute, which doesn't really make sense.  Now we
do the right thing based on the computed white-space style.
Backed out changeset 88befbeb7321 (bug 1102177) for crashtest bustage
Bug 1088969 - Upgrade Mozilla 36 to use NSS 3.17.3, changing version numbers, only.
Bug 1105232 - Fix race condition updating copy-on-write array owner pointer in compacting GC r=terrence
Bug 1102858 - Fix tracing of debugger objects' private pointers for compacting GC r=terrence
Bug 1104843 - Fix JSRuntime::isSelfHostingZone() to not crash before self hosting has been initialized r=terrence
Bug 1104162 - Don't enter PHASE_MINOR_GC stats phase until after verifying post barriers r=terrence
Bug 650366 - Account for the checkmark in combobox on OSX r=davidb
Bug 1102607 - make GMPStorage APIs callable off the main thread. r=cpearce.
Bug 1105781 - Unbreak unified build after bug 1083648. r=bz
Backed out changeset 97150f502eeb (bug 1102858) for breaking b2g builds

--HG--
extra : rebase_source : 7208ba7bced1fce95197ad8ed146c87f69e71363
Bug 1101625 part 1 - Don't escape all non-ASCII characters when unsafe characters are found, just escape the unsafe characters.  r=smontagu
Bug 1101625 part 2 - Remove the aIRI param since it's always true. And some minor code cleanup.  r=smontagu
Bug 1105938 - Don't use nsCSSProps::PropHasFlags(eCSSPropertyExtra_variable, ...).  r=heycam
Bug 1105184 - Setup the mCaret used for DND so that it displays the caret also when dragging a selection within the same shell.  r=roc
Bug 1102374 - Enable display:contents by default in non-release builds.  r=dbaron
Merge b-i to m-c, a=merge
Merge m-c to b-i