Bug 937627 - The webgl constructs cache should be per context, not per document global, r=rcampbell
Bug 938162 - if it looks, swims and quacks like a duck, but doesn't end in .js, let's not call it a test, r=gps

--HG--
extra : rebase_source : 700e855b79998028d57590c445f7f4b390bd0f9d
Merge mozilla-central and fx-team
Bug 918203 - Follow up - fixup bogus resize call. r=me
Bug 934359 - Solve endless loop problem in gecko/build/annotationProcessors/utils/Utils.java. r=kats
Bug 916766 - Consistent theming across panels - added scratchpad and variable view;r=paul
Bug 937185 - Discard old apzcs if the ScrollableLayerGuid is updated. r=kats
Merge m-c to fx-team on a CLOSED TREE
Bug 919965 - improve dnd feedback in the panel, r=mikedeboer
Backed out changeset 77c3e8e02df4 (bug 919965) to fix commit msg
Bug 919965 - [Australis] improve dnd feedback in the panel, r=mikedeboer
DONTBUILD because I'm just relanding to fix the commit message
Bug 931845 - Shows image tooltips immediately and with no animation. r=bgrins
Bug 935604 - Part 1: Fix graphical corruption on page load. r=lucasr
Bug 935604 - Part 2: Typing about:home directly does not break tab. r=sriram
Bug 887043 - Use an async SQL query instead of a result to collect backups data. r=mak
Bug 936297 - Expose posix_spawn_file_actions_t via Constants.libc. r=Yoric
Bug 937769 - JS Error: Error in invoking addEngine, no onError. r=lucasr
Bug 937829: QuickShare with more icons. [r=mfinkle]

--HG--
rename : browser/themes/linux/Toolbar-inverted.png => browser/themes/windows/Toolbar-inverted.png
extra : rebase_source : b3bea92b63ce42d7bec2a2da55075e42453b3e56
Bug 937829: Cleanup the layout glitch when only one share icon is shown. [r=mfinkle]

--HG--
extra : rebase_source : c9432f960f8295d27d2756406dd0067d7427d83e
Bug 937829: Make QuickShare aware of the history to choose the icons. [r=mfinkle]

--HG--
extra : rebase_source : 9a6d15dc3e4355c9063a4d49cae02259cf3d4cb3