Bug 257061: adding a counter of found matches to the find in page bar. r=Unfocused
Bug 662744 - remove obsolete background image rules, r=dao

--HG--
extra : rebase_source : 02de983ca70eb349cfc31adf4af3ac95df8731a0
Bug 1004410 - allow running mochitests against an arbitrary binary, r=jmaher

--HG--
extra : rebase_source : ba7e34aaffe2dd845b8717a34dc27c7f59983534
Merge mozilla-central and fx-team
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, r=past
Bug 988909 - Move ContextMenuInfoFactory out of HomeListView and into HomeContextMenuInfo. r=lucasr
Bug 988909 - Support context menus in PanelViews. r=lucasr
Bug 916052 - Adapt about:cache to the HTTP cache v2 API, r=michal+MattN
Bug 799216 - allow leaving out head/tail entries in xpcshell manifests, r=ted

--HG--
extra : rebase_source : 39cdf74579aefcfcdd7e3cfc7d39edbdb8b6f007
bug 1003812 - Check for Windows 8 SDK for building Gamepad on Windows. r=glandium
Bug 1003161 - Don't optimize arguments usage in scripts with aliased arguments, r=jandem.
Bug 1004469: Apply scale to both width and height in canvas skia max size check. r=snorp
Merge mozilla-central and inbound
Bug 949518 - keep caret offset syncronized with accessible tree, r=surkov
Bug 819549 - Signaling unittests should dispatch to main thread when calling PC. r=jesup
Bug 944731 - Add a border to color swatches. r=mratcliffe
Bug 961288 - Add an object metadata callback for tracking object allocation sites. r=ejpbruel
Bug 1002527 - Fix not to initialize remote browser's ContentParent twice. r=bent

ContentParent::GetNewOrUsed() initialize the ContentParent always, even it is an
initialized one from PreallocatedProcessManager::Take(). Initialize twice makes
ContentParent to receive two the same observed event, and creates leak in both
observer list and itself.
Bug 1002754 - Don't store a pointer to the cross-process compositor parent as it may go bad; pull it on demand instead. r=rbarker, r=botond
Bug 1003902: Drop 'const' qualifier from arg in EscapeStringForLIKE() function-decl to make it match the IDL-generated decl. r=mak