fix argument name
adding baseBase configuration
Merge branch 'dev-3.x' of github.com:yui/yui3 into group-config-inheritance
consolidate support for baseBase with the corresponding inheritance for groups. removing legacy /build segment from the default CDN path
Lang.sub(): Move existing unit tests into separate test case
Lang.sub(): Harden existing unit tests
Lang.sub(): Implement nested placeholders
Merge branch 'nested-sub' of github.com:customcommander/yui3 into dev-3.x
Add history entry.
Build yui.
Resolve "Uncaught TypeError: undefined is not a function" error when both *timeout* and *failure* are defined. Fixes #1817 [stanleyhlng]
resolve undefined object self._failures[proxy]. Fixes #1817 [stanleyhlng]
Merge branch 'dev-master' into dev-3.x
Merge branch 'dev-master' into dev-3.x
Merge branch 'dev-master' into dev-3.x
Merge branch 'dev-master' into dev-3.x
3.18.0-pre package and bower bumps.
Merge branch 'dev-master' into dev-3.x

Conflicts:
	bower.json
	build/yui-nodejs/yui-nodejs-min.js
	build/yui/yui-min.js
	package.json
Merge branch 'dev-master' into dev-3.x
Merge branch 'dev-master' into dev-3.x