Permalink
Browse files

Merge branch 'master' of github.com:mikel/rails

Conflicts:
	actionmailer/lib/action_mailer/tmail_compat.rb
  • Loading branch information...
2 parents 2f1aaeb + 79280a2 commit e372f25b0d21da0869a09c1469f193403b6f0ca0 @mikel mikel committed Dec 31, 2009
Showing with 0 additions and 0 deletions.

0 comments on commit e372f25

Please sign in to comment.