author Wes Kocher <>
Wed, 26 Feb 2014 18:13:35 -0800
changeset 171217 ef13453839909de4e5d4f9db0b3996110558173e
parent 40458 1584ba8c1b86f9c4de5ccda5241cef36e80f042c
permissions -rw-r--r--
Merge fx-team to m-c

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: