Merge branch 'master' of git@github.com:rails/rails

This commit is contained in:
Yehuda Katz
2009-05-27 10:40:55 +02:00