Merging in version bump NO BUG CLOSED TREE
Bug 841919 turn off --enable-metro from win32 mozconfigs for Aurora CLOSED TREE
Merging in branding changes NO BUG CLOSED TREE ba=release
Disable profiling on Aurora NO BUG CLOSED TREE ba=release
Merging in l10n changes NO BUG CLOSED TREE ba=release
Bug 842772 - Don't test for mask-type when the pref is disabled. r=dbaron a=test-only
Bug 842829 - Fix test_condition_text.html to parse the style sheet after the pref is set. r=dbaron a=test-only
Bug 842389 - return the right thing from ProgressiveUpdate; r=BenWa,cwiiis a=lsblakk
Bug 843040 - Set FINAL_TARGET before including rules.mk in xulrunner/stub/Makefile.in. r=bsmedberg,a=bajaj

--HG--
extra : transplant_source : %01m%B7%82%08V%2C%8B%89%9B%86%CBW%10y%A3C%AA%E1S
Bug 843029 - Add more retries to ensureDatabaseIsNotLocked r=blassey r=lucasr a=lsblakk
Bug 841359 - Always log error originating from windows with chrome principals. r=bz a=lsblakk
Back out b3bdec87d963 (bug 840722) for causing bug 842418. r=me,a=lsblakk
Bug 842577 - Remove from History is visible for a paused download.
r=mconley a=bajaj
Bug 838713 - Skip slow-startup check if startup was interrupted. r=jaws a=lsblakk
Bug 841094 - Don't special-case extensions/ and searchplugins/ directories when creating complete and partial mar, but special-case distribution/extensions. r=rstrong,r=bhearsum,a=bajaj
Bug 840480. r=roc, a=lsblakk
Bug 843361 - Dump list of open files if we fail to unlock the DB r=blassey a=lsblakk
Bug 840263 - Make sure to notify the right navigation timing about page load. r=hsivonen, a=lsblakk
bug 843933 - disable health report on Aurora, r=gps, a=akeybl CLOSED TREE
Back out fde0a9170a83 (bug 843933) for violating the tree rules, violating the tree status, and for causing bustage
CLOSED TREE