Wrong scope

-

-
Merge branch 'master' of github.com:petkaantonov/bluebird

Conflicts:
	js/bluebird.js
	js/bluebird_debug.js
	js/bluebird_sync.js
	src/async.js