Skip to content
Commit 9d310967 authored by Christoph Goehre's avatar Christoph Goehre
Browse files

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
parents 8027c3e6 609bb25d
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment