Merge branch 'build_step' of github.com:broofa/node-mime into build_step · broofa/mime@f44261e · GitHub

Commit

Merge branch 'build_step' of github.com:broofa/node-mime into build_step

Browse files

Conflicts:
	package.json

Loading branch information

broofa committed Feb 5, 2015

2 parents fdc1f31 + db8d95e commit f44261e