Merge branch 'master' into wip-0.8

sokra · sokra · commit bca33594a8fb · 2012-11-09T11:37:39.000+01:00
Conflicts:
	examples/code-splitting/README.md
diff --git a/README.md b/README.md
@@ -387,6 +387,11 @@ You can also save this options object in a JSON file and use it with the shell c
  // ignore all Code Splitting and emit only a single file
  // all code is included and should work as with Code Splitting
 
+ minimize: true, // default: false
+ // minimize resources for production use
+ // javascript is minimized with uglify-js2
+ // loaders will minimize other resources
+
  debug: true, // default: false
  // put the source of the modules into annotated eval,
  // which cause a nice debug experience in some dev tools
