Tinker with requirements.
Merge branch 'master' of github.com:cedric/spamtrap

Conflicts:
	test/test_helper.rb