nsprpub/TAG-INFO
author Gregory Szorc <gps@mozilla.com>
Wed, 27 Feb 2013 21:02:02 -0800
changeset 123267 1e646e6ddbcd5c3dd2c8233945d14ef1154bd16f
parent 121581 9a6bef63fdc05d756079ec9d725a32ca822949a6
child 124859 09fefb4d9a81ad11b546e52cc17cb70ae647c725
permissions -rw-r--r--
Merge mozilla-central into build-system The 3 merged files had no conflicts and were manually verified to ensure no incompatible changes crept in.

NSPR_4_9_6_BETA2