Permalink
Browse files

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

Conflicts:
	actionmailer/actionmailer.gemspec
	actionmailer/lib/action_mailer/vendor/text-format-0.6.3/text/format.rb
  • Loading branch information...
mikel committed Jan 8, 2010
2 parents e2aa671 + fcf2dd3 commit 82407f94aad1a8c15a0d19d39d1fed20868c4531
Showing with 0 additions and 0 deletions.

0 comments on commit 82407f9

Please sign in to comment.