diff app/models/user.rb @ 551:61e0de6cc1bb cannam_integration

Merge from branch "feature_36"
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Mon, 01 Aug 2011 19:05:24 +0100
parents ec7c78040115
children 5e80956cc792
line wrap: on
line diff