author Philipp von Weitershausen <>
Wed, 02 Mar 2011 22:12:34 -0800
changeset 63309 c046188bb2f968cc0b45e1e9749e7bcb01f9815d
parent 40458 1584ba8c1b86f9c4de5ccda5241cef36e80f042c
permissions -rw-r--r--
Merge services-central with mozilla-central. a=blocking-fennec

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: