Bug 805338 - Use http://127.0.0.1:1/ as a reliable error page for testing r=jaws
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
Merge fx-team with mozilla-central