Bug 1052900 - Restore -moz-win-exclude-glass handling to the way it worked before. r=tn, a=lsblakk
Bug 1083167 - Fix FormHistory error in ContentSearch by not passing an empty string to FormHistory.update. r=MattN, a=lmandel
Bug 1073134 - Be more permissive on OSX 10.9.5 when parental control is on. r=jdm, a=lmandel
Bug 1090450 - Properly check add-on update state during update interval. r=Mossop, a=lmandel

A refactoring in bug 995108 inadvertently disabled background add-on updates by
moving the timer handler to AddonManagerPrivate without fixing the values the
method uses to point to meaningful locations.
Bug 1081926 - Fallback on a simple image lookup when the normal lookup fails. r=mattwoodrow, a=lmandel
Bug 1076910 - Don't use gfxPlatform::GetPlatform() off the main thread. r=Bas, a=sledru
Bug 1076910 - Add some error checks to gfxUtils::EncodeSourceSurface. r=Bas, a=sledru
Bug 1084280 - Use a local RegExpStack when running the RegExp interpreter. r=jandem, a=dveditz
Bug 1077514 - Execute regexps in the bytecode interpreter if the initial JIT execution was interrupted. r=jandem, a=lmandel
Merge mozilla-beta to b2g34. a=merge