update to rails 2.3.15
Merge branch 'master' into comments