Merge branch 'upstream' into dfsg-upstream
Conflicts: mozilla/other-licenses/branding/firefox/pref/firefox-branding.js mozilla/other-licenses/bsdiff/bsdiff.c mozilla/plugin/oji/JEP/JavaEmbeddingPlugin.bundle/Contents/MacOS/JavaEmbeddingPlugin mozilla/plugin/oji/JEP/JavaEmbeddingPlugin.bundle/Contents/Resources/Java/JavaEmbeddingPlugin.jar mozilla/plugin/oji/JEP/MRJPlugin.plugin/Contents/MacOS/MRJPlugin mozilla/plugin/oji/JEP/MRJPlugin.plugin/Contents/MacOS/MRJPlugin.jar mozilla/plugin/oji/JEP/MRJPlugin.plugin/Contents/Resources/MRJPlugin.rsrc
Loading
Please register or sign in to comment