Dan Witte 0ef09abf02 Merge mozilla-central -> e10s.		2010-08-13 21:24:11 -07:00
..
boot	Bug 536301 - e10s HTTPS: securityInfo. r=jduell, sr=kaie	2010-08-13 01:06:40 -07:00
locales	Bug 539174 - Add localization note and use positional arguments in l10n. r=db48x	2010-07-24 11:02:26 +02:00
pki	Bug 511320 - When FIPS mode change fails, inform the user. r=kaie	2010-07-18 22:27:23 +02:00
ssl	Bug 536301 - e10s HTTPS: securityInfo. r=jduell, sr=kaie	2010-08-13 01:06:40 -07:00
Makefile.in	partial backout of bug 580679 - Build NSS with the TLS zlib compression code a=bsmedberg	2010-08-13 15:49:56 -03:00
android_stub.h	bug 577635 typo fix	2010-07-16 16:11:31 -04:00