author Ehsan Akhgari <>
Thu, 14 Jun 2012 10:53:19 -0400
changeset 96694 428b1777daa122844a5af2579c4f3f045bd4b5b6
parent 40458 1584ba8c1b86f9c4de5ccda5241cef36e80f042c
permissions -rw-r--r--
Merge mozilla-central into mozilla-inbound to pick up the backout of bug 753022

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: