kpdecker cb0c45b29f Merge branch 'master' into es6-modules ...

Conflicts:
	Gruntfile.js
	Rakefile
	dist/handlebars.js
	dist/handlebars.runtime.js
	lib/handlebars.js
	lib/handlebars/base.js
	lib/handlebars/runtime.js
	lib/handlebars/utils.js
	package.json

2013-09-02 18:19:18 -05:00

..

handlebars

Merge branch 'master' into es6-modules

2013-09-02 18:19:18 -05:00

handlebars.js

jshint

2013-08-24 12:06:25 -05:00