rails12
Merge pull request #5 from christopherpetrino/rails12

rails12