Bug 1006360 - prevent failures backing up bookmarks from stopping sync completing. r=rnewman, a=sylvestre
Bug 1003707 - Pass surfaces sizes in to CreateSourceSurfaceFromNativeSurface instead of trying to extract it from cairo. r=Bas, a=sledru
Bug 1007850 - Don't reset seer if it's not enabled. r=mcmanus, a=sledru
Backed out changeset 7d945895a6d9 (bug 1003707) for bustage.
Bug 915879 - Wait for _writeFile to finish before continuing. r=fabrice, a=lsblakk
Bug 1004168 - Add an INI file option to prevent requiring a reboot when there are files in use. r=jmathies, a=lsblakk
Bug 1005622 - Reset media queues in Android media seek so that we don't think we're still at EOS after playing to EOS and then seeking. r=edwin, a=sledru
Bug 1009042 - add example.net to server-locations.txt; r=jmaher
Bug 995943 - Clean up some silly stuff surrounding prefs in CAPS. r=bz
Bug 995943 - Allow access to file:// URIs from pref-whitelisted sites. r=bz a=lsblakk
Bug 977089 - Don't pass ID3 headers to GStreamer. r=cpearce, a=lsblakk
Bug 1003542 - Remove extra space at bottom of single-item menus in bookmarks menu button panel menus. r=mikedeboer, a=lsblakk
Merge mozilla-beta to b2g30. a=merge