Merge branch 'rails3' of github.com:TracksApp/tracks into rails3

This commit is contained in:
Reinier Balt 2012-05-12 13:42:57 +02:00
commit ba0b637c85