author Ryan VanderMeulen <>
Mon, 19 Aug 2013 11:54:12 -0400
changeset 143073 5e29096a0d1243482ec16d8c1fbf3d7afe97218c
parent 40458 1584ba8c1b86f9c4de5ccda5241cef36e80f042c
child 346556 b5ac524ed7c8707a7bb6ab54f334f9bc159b4bfd
permissions -rw-r--r--
Merge m-c to fx-team.

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: