author Phil Ringnalda <>
Sat, 28 Mar 2015 11:45:00 -0700
changeset 236361 e16dc56f90d5c2e0e338876545542cf01f597e8d
parent 40458 1584ba8c1b86f9c4de5ccda5241cef36e80f042c
permissions -rw-r--r--
Merge m-c to m-i to m-c merge, a=mergemerge

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: