merging our two solutions
Fix nodemailer#150
Merge remote-tracking branch 'origin/master'
Bumped version to v0.5.3
Fixed mixed RFC2231 (filename*0, filename*1) handling
Fixed nodemailer#117, Bumped version to v0.5.1
Bumped version to 0.5.0
Bump version
Fixed nodemailer#112. Bumped version to v0.4.9