author Alex Keybl <>
Mon, 09 Dec 2013 15:12:05 -0500
changeset 174213 f6256a62e800338b486350466b15017e79510121
parent 40458 1584ba8c1b86f9c4de5ccda5241cef36e80f042c
permissions -rw-r--r--
Merging in branding changes NO BUG CLOSED TREE ba=release

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: