author Wes Kocher <>
Fri, 08 May 2015 10:29:41 -0700
changeset 243041 5e8adf0e7f2cc879413aebff0c26523f0ff4f2ae
parent 40458 1584ba8c1b86f9c4de5ccda5241cef36e80f042c
permissions -rw-r--r--
Merge fx-team to m-c a=merge

Please see the file toolkit/content/license.html for the copyright licensing
conditions attached to this codebase, including copies of the licenses

You are not granted rights or licenses to the trademarks of the
Mozilla Foundation or any party, including without limitation the
Firefox name or logo.

For more information, see: