Bug 835499 - Remove the runningInIon flag at the end of convertFrame. r=dvander
Bug 836373 - IonMonkey changes to compareString for the baseline jit. r=jandem
Bug 836949 (part 1) - Clean up the versions/options code.  r=jorendorff.

--HG--
rename : content/html/content/test/test_meta_attributes_reflection.html => content/html/content/test/test_ol_attributes_reflection.html
extra : rebase_source : 970d8a542bb631ce3f18da26ece69667af29d0a9
Bug 838807: Replace tab-carats. [r=mfinkle]
Bug 838735: Remove transparency from inactive tabs. [r=mfinkle]
Bug 838748: Change pressed state of tabs-ui rows. [r=mfinkle]
Bug 838807: Remove tablet specific tabs-ui icons. [r=mfinkle]
Bug 818072: Back/Forward looks disabled. [r=mfinkle] [needs-clobber]
Bug 836589 - Lazily switch between AwesomeBar search and URL modes; r=blassey
Bug 824785 - social toolbar buttons should have an aria-label.  r=jaws
Bug 792797 - Handle interrupts in the Yarr interpreter. r=dvander
Bug 838969 - prevent certain social features from working in private windows.  r=gavin
Bug 799709 - Create a 10MB sdcard by default, r=jgriffin
Bug 769872 - Add self-hosted JavaScript core of Intl constructors Collator, NumberFormat, DateTimeFormat (part 6). r=jwalden

--HG--
extra : rebase_source : 714d2776e671bf8587c95f2b19b576fb68d957b7
Backed out changeset 5abed7bd3cb7 (bug 838014)
Backed out changeset b5ec7ce219b2 (bug 838014)
Backed out changeset ced35810adb2 (bug 838014). Again.
Bug 839302: Simplify logic in nsBlockFrame::DrainSelfOverflowList, and replace delete w/ nsAutoPtr. r=mats
Bug 830278. Part 2: Move mDisallowSelectionPrint check into IsThereARangeSelection to make sure code doesn't re-enable selection printing. r=heycam

--HG--
rename : dom/voicemail/Makefile.in => dom/telephony/Makefile.in
rename : dom/voicemail/nsINavigatorVoicemail.idl => dom/telephony/nsIDOMNavigatorTelephony.idl
rename : services/sync/tests/unit/test_utils_json.js => services/common/tests/unit/test_utils_json.js
extra : rebase_source : a900eaa265af5c4fa6e0355608cf2e384e1cd193
Bug 839094 - PhoneNumberJS: handle countries sharing the same meta-data correctly. r=gal