merge mozilla-inbound to mozilla-central a=merge

Brli · Jul 30, 2016 · 388eb7d · 388eb7d
2 parents bdda254 + 6a9117d
commit 388eb7d
Show file tree

Hide file tree

Showing 337 changed files with 8,734 additions and 2,630 deletions.
diff --git a/CLOBBER b/CLOBBER
@@ -22,4 +22,4 @@
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Bug 1287827 - Clobber needed because this patch removes files, second landing.
+Bug 1287827 - Clobber needed because this patch removes files, second landing AND Bug 1272693 - Clobber required to rebuild NSS.