Bug 884421 - Automatic network port selection for /services tests; r=rnewman
Bug 884421 - Part 2: Use a non-standard port in DUMMY_URI; r=bustage
Bug 884421 - Part 3: Fix test_service_wipeServer; r=bustage
Merge mozilla-central into services-central
Bug 881018 - Save TiledLayerBuffer::mResolution to stack to help investigate crash; r=kats
Back out changeset e8bf739addfa (bug 868498 patch 2) for causing bug 894931.
Bug 870941: Remove CSS rules for overlay scrollbars that became unnecessary. r=roc
Bug 870941: Display overlay scrollbars on top of content in XUL trees. r=roc
Bug 870941. Make scrollframes put scrollbars etc above content in z-order if they're disappering scrollbars. r=mattwoodrow