diff app/models/user.rb @ 521:6a141ac4772e cannam_integration

Merge from branch "cannam"
author Chris Cannam
date Mon, 25 Jul 2011 13:16:57 +0100
parents ec7c78040115
children 5e80956cc792
line wrap: on
line diff