author Tim Taubert <>
Tue, 24 Apr 2012 11:35:52 -0400
changeset 93562 357da346ceb705d196a46574804c7c4ec44ac186
parent 40458 1584ba8c1b86f9c4de5ccda5241cef36e80f042c
permissions -rw-r--r--
merge m-c to fx-team; a=desktop-only

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: