diff app/models/user.rb @ 510:1afe06d9ba94 cannam_integration

Merge from branch "cannam"
author Chris Cannam
date Thu, 14 Jul 2011 10:42:41 +0100
parents ec7c78040115
children 5e80956cc792
line wrap: on
line diff