author Ryan VanderMeulen <>
Mon, 22 Apr 2013 21:15:00 -0400
changeset 129468 f59811fe0fb3d303fd20abc4e10432488c3d3db5
parent 40458 1584ba8c1b86f9c4de5ccda5241cef36e80f042c
permissions -rw-r--r--
Merge birch 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: