diff app/models/user.rb @ 803:6fa65a452888 cannam

Merge from branch feature_14
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Tue, 22 Nov 2011 13:37:50 +0000
parents ec7c78040115
children 5e80956cc792
line wrap: on
line diff