Bug 845022 - Remove outdated links from about:plugins. r=dolske
DONTBUILD
Bug 404077:  Fix think-o in previous annotations of expected assertions.  CLOSED TREE
Bug 845095 - backed out 8cb9d6981978 as per r=surkov
Bug 846065 - Adjust low memory killer parameters so that we will keep a larger file cache. r=jlebar
Bug 838244 - Create a directory for shared browser theme resources. r=gavin

--HG--
rename : browser/themes/browserShared.inc => browser/themes/shared/browser.inc
Bug 838244 - Move common highlighter CSS to browser/themes/shared/. r=dcamp

--HG--
rename : browser/themes/winstripe/browser.css => browser/themes/shared/devtools/highlighter.inc.css
Bug 838244 - Move common GCLI CSS to browser/themes/shared/. r=dcamp

--HG--
rename : browser/themes/winstripe/browser.css => browser/themes/shared/devtools/commandline.inc.css
Bug 838244 - Move common responsive design mode CSS to browser/themes/shared/. r=dcamp

--HG--
rename : browser/themes/winstripe/browser.css => browser/themes/shared/devtools/responsivedesign.inc.css
Bug 838244 - Move common social API chat CSS to browser/themes/shared/. r=jaws

--HG--
rename : browser/themes/winstripe/browser.css => browser/themes/shared/social/chat.inc.css
b=842468 use scrollbar pref thickness instead of min for resizer size r=roc
b=842468 include border in scrollbar track min size r=roc
b=788935 remove unused no-op virtual GLContext::WindowDestroyed() r=vlad
CLOSED TREE
Bug 833724 - Use actual playback position to calculate free buffer space and change start-after-write logic in sydneyaudio Gonk backend. r=mchen

--HG--
extra : rebase_source : c9cb0ea2264713facc0d7c27e16342eb13d9751a
Bug 829832 - NEEDS CLOBBER - Compute SHA256 hash on saving files in BackgroundFileSaver. (r=paolo,cviecco,sr=biesi)
Bug 844328 - Silence debug warning about _onTouchStart return value [r=jimm]
Bug 840360 - Extract reftest-content.js's setTimeout implementation into new Timer.jsm [r=jwalker r=cjones sr=gavin]

--HG--
rename : browser/devtools/shared/Browser.jsm => toolkit/modules/Timer.jsm
rename : browser/devtools/shared/test/browser_browser_basic.js => toolkit/modules/tests/xpcshell/test_timer.js
Bug 843747 - Disable handful of b2g emulator mochitests that fail with an ubuntu vm as host, r=jgriffin
* * *
Bug 843747 - Disable dom/encoding/test/test_stringencoding.html for timeout on Ubuntu VM
* * *
Bug 843747 - disable mochitests that fail on Ubuntu 64 vm
Bug 842946 - When there is no selected tab, don't try to apply viewport updates. r=mfinkle
Bug 844930 - Make deprecation warning more useful. r=bnicholson
Merge m-c to inbound.