author Ryan VanderMeulen <>
Tue, 30 Jul 2013 18:08:18 -0400
changeset 152922 0d8409268f42fb2d9847ac7e874eb3036a284816
parent 1 9b2a99adc05e53cd4010de512f50118594756650
permissions -rw-r--r--
Merge m-c to inbound.

Please see the file ../toolkit/content/license.html for the copyright 
licensing conditions attached to this codebase, including copies of the
licenses concerned.

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.