Bug 661982: Toolkit Add-ons Manager logging to be changed to use Log.jsm;r=irving
Bug 975792 - ContentProvider tests don't clean up their cursors. r=nalexander
Bug 975792 - Follow-up: attempting to fix bustage that only appears on tinderbox. a=test-only
Bug 973338 - add a localization note for .before and .after entities.  r=ttaubert
merge fx-team to mozilla-central