response.sendFile() now using utils.mixin() to mix in optional headers Conflicts: 	lib/response/index.js
response.sendFile() now using utils.mixin() to mix in optional headers
Conflicts:
	lib/response/index.js

insidewarehouse/ejs,mmis1000/ejs-promise,kolonse/ejs,zensh/ejs,mde/ejs,insidewarehouse/ejs,cnwhy/ejs,tyduptyler13/ejs,kolonse/ejs,jtsay362/solveforall-ejs2,operatino/ejs,TimothyGu/ejs-tj,zensh/ejs,rpaterson/ejs,cnwhy/ejs,TimothyGu/ejs-tj,xanxiver/ejs