Merge branch 'dev-master' into dev-3.x

Conflicts: build/loader-pathogen-encoder/loader-pathogen-encoder-min.js build/yui-base/yui-base-coverage.js build/yui-base/yui-base-min.js build/yui-core/yui-core-coverage.js build/yui-core/yui-core-min.js build/yui-nodejs/yui-nodejs-coverage.js build/yui-nodejs/yui-nodejs-min.js build/yui/yui-coverage.js build/yui/yui-min.js
yui · Sep 25, 2014 · 3ffdf5f · 3ffdf5f
2 parents 9aebef7 + 4281409
commit 3ffdf5f
Show file tree

Hide file tree

Showing 49 changed files with 6,034 additions and 3,488 deletions.
diff --git a/build/handlebars-base/handlebars-base-debug.js b/build/handlebars-base/handlebars-base-debug.js
diff --git a/build/handlebars-base/handlebars-base-min.js b/build/handlebars-base/handlebars-base-min.js