Bug 923247 - patch 2 - mute and volume per window, r=ehsan, r=roc
Bug 923247 - patch 3 - audio-active/inactive notifications per window, r=ehsan, r=roc

--HG--
rename : content/html/content/test/wakelock.ogg => dom/base/test/audio.ogg
Bug 981314: Relax block creation check for dead code in CheckIfCondition; r=luke

--HG--
extra : rebase_source : 87fce1b5514e3a65d3a8124e7e7d248ff3ea61ab
Bug 981325: Consider Float32 not to be a simple primitive; r=h4writer

--HG--
extra : rebase_source : 1a8d2f001f3bfa4acf60dfcc9fdbc901bd3b8345
Backed out changeset d19f076a7451 (bug 923247)
Backed out changeset 98f7e8789561 (bug 923247)
Backed out changeset d86a702e24c0 (bug 923247) for build failures; CLOSED TREE
Bug 975338 - Add nsIDivertableChannel and ADivertableChannelParent r=jduell
Bug 975338 - Add PChannelDiverter and new messages to PHttpChannel r=jduell
Bug 975338 - Implement nsI|ADivertableChannel in HttpChannelChild|Parent r=jduell
Bug 975338 - Implement nsI|ADivertableChannel in FTPChannelChild|Parent r=jduell
Bug 980015 - Remove MOCHITEST_FILES et. al. r=gps

--HG--
extra : rebase_source : 3825abc63eb0901bc1422aa00aed3680dbe3e44c
bug 981513 - revert 807441 r=sworkman

--HG--
extra : rebase_source : d2c219fe01b6e4e0fdf25b920df0091039cf4c18
bug 981447 - use more conservative dns caching values r=sworkman

--HG--
extra : rebase_source : 6ec1873cf1d8202fd49575303e984155b8403bf6
Backed out changeset 7a78f199e1cd (bug 975338)
Backed out changeset 1b4b0a309453 (bug 975338)
Backed out changeset 97858e5c1f13 (bug 975338)
Backed out changeset ce8ed7a0dfef (bug 975338) for build failures; CLOSED TREE
Backed out changeset 88780b5a201e (bug 980015) for test_property_database.html failures.
CLOSED TREE
Merge m-c to inbound on a CLOSED TREE.