1.6: Unknown options are passed directly to mail to handle.  Remove deprecated syntax
Update rspec to v2.14 and to use expect over should and eq over ==
Merge pull request #8 from durrantm/rspec_update

Update rspec to v2.14 and to use expect over should and eq over ==
Use ruby 1.8.7 hash syntax
Merge branch 'master' of github.com:benprew/pony

Conflicts:
	Gemfile.lock
fix content type
Merge pull request #9 from roman-franko/master

fix content type
1.7 release
Add additional options for headers in each part of letter
Merge pull request #10 from roman-franko/master

Add additional options for headers in each part of letter
1.8 release
Allow options to be queried from the gem
Merge pull request #11 from neilmiddleton/explicit_options

Allow options to be queried from the gem
bump to 1.9 and upgrade rspec
adds override_options
Update README.rdoc
adds subject_prefix and append_options
updates readme
Merge branch 'master' of https://github.com/rmalecky/pony
Merge pull request #12 from rmalecky/master

Development tools