author Ryan VanderMeulen <>
Thu, 23 Oct 2014 14:07:56 -0400
changeset 211981 cda97cb2f4ac695d3451f61189fdd83a31cacfb6
parent 40458 1584ba8c1b86f9c4de5ccda5241cef36e80f042c
permissions -rw-r--r--
Merge m-c to fx-team. 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: