Merge remote-tracking branch 'origin/master' into add/setimmediate

jhnns · jhnns · commit 08454a675936 · 2015-01-07T13:38:41.000+01:00
diff --git a/lib/webpack.js b/lib/webpack.js
@@ -77,7 +77,7 @@ exportPlugins(exports, ".", [
 	"UmdMainTemplatePlugin",
 	"NoErrorsPlugin",
 	"NewWatchingPlugin",
-	"EnvPlugin"
+	"EnvironmentPlugin"
 ]);
 exportPlugins(exports.optimize = {}, "./optimize", [
 	"AggressiveMergingPlugin",
