diff app/models/user.rb @ 588:91389d8bbdea cannam

Merge from bug_255
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Fri, 12 Aug 2011 14:40:44 +0100
parents 753f1380d6bc
children ec7c78040115
line wrap: on
line diff