author Phil Ringnalda <>
Fri, 30 Sep 2016 23:24:52 -0700
changeset 316107 fcc62bbf09eecabf27c8d198d5d3719e16b296ea
parent 40458 1584ba8c1b86f9c4de5ccda5241cef36e80f042c
permissions -rw-r--r--
Merge m-i 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: