Bug 949902 - Correct "Up to" strings in Bookmarks View, deleted unused icons, and update tests. r=lucasr
Bug 994263 - Destroy GC'd nodes in the web audio editor views. r=vp
Bug 1007112 - Add default mime type for pick action if unspecified. r=myk
Bug 1008372 - Don't specify column when moving a breakpoint so it's stored correctly. r=fitzgen
Bug 1014046 - Project Editor: Re-enable tests on Windows. r=harth
Bug 1029735 - ContentSearch sometimes leaks event listeners and their closures. r=ttaubert
Bug 1029735 - ContentSearch sometimes leaks event listeners and their closures (follow-up). r=ttaubert
Bug 929865 - Part 1: Reference org.mozilla.gecko directly when handling application/webapp intent. r=myk

--HG--
extra : rebase_source : 093bfcf485bbd4844c3c9a426bb756aef20fdae8
Bug 929865 - Part 2: Use <activity-alias> to wrap activities in generated namespace. r=bnicholson,myk

--HG--
rename : mobile/android/base/App.java.in => mobile/android/base/App.java
rename : mobile/android/base/Webapp.java.in => mobile/android/base/Webapp.java
extra : rebase_source : 176139e89facd5e96cff25dd4012c4e269d4a0a0
Bug 929865 - Part 3: Replace org.mozilla.gecko.App with BrowserApp. r=bnicholson

--HG--
extra : rebase_source : 261ac97c97d3f30ead5abcdd61034c38084e491b
Bug 929865 - Part 4: Move WebApps to webapp.Webapps; rename WebApp<n> to Webapp<n>. r=myk

--HG--
extra : rebase_source : c16aae95aae1145907a4b40d48256f5e9bbaa516
Bug 1029097 - ViewHelpers.Prefs should have a way of clearing the cached preferences, r=rcampbell
Bug 1029540 - ViewHelpers.L10N.numberWithDecimals doesn't properly handle NaN and numbers that can't be localized, r=bgrins
Bug 1020541 - JS Stacks no longer reported in the profiler, r=benwa,djvj
Merge m-c to fx-team a=merge
Bug 1029232 - Part 1: Reference generated Java sources correctly. r=trivial
Bug 1029232 - Part 2: Include rather than reference Fennec Eclipse resources. r=trivial
Bug 1029232 - Part 3: Call Eclipse builder plugin before Android build steps. r=bnicholson
Bug 1014247 - Build omni.ja from within Eclipse. r=rnewman
Bug 1029232 - Follow-up: Fix busted test. r=bustage