Bug 805338 - Use http://127.0.0.1:1/ as a reliable error page for testing r=jaws
Bug 831393 - send manifestURL in the desktop-notification event. r=vingtetun. a=lsblakk
Bug 828052 - Update Cleopatra and fix the issue with gJavaScriptOnly flag not working; r=past
Bug 496471 - Silence satchel warning about ORDER BY without an index since an index can't be used. r=dolske
Bug 829995 - Ignore case of .url extension when migrating bookmarks from Internet Explorer. r=felipe
Bug 808280 - Remove unused imports from mozconfig.py; r=ted

By preventing the import of pymake, multiprocessing is no longer
imported and BSDs should no longer choke when trying to import it.

DONTBUILD
Merge fx-team with mozilla-central
Merge m-c to inbound.
Bug 752218 - Replace usage of AddURI with updatePlaces. r=mak
Bug 829909 - Fix some Plugin Hang UI synchronization problems. r=bbondy