diff app/models/user.rb @ 342:3564e1ae2ff7 cannam-pre-20110113-merge

Merge
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Thu, 31 Mar 2011 11:13:21 +0100
parents 440c4f4bf2d6
children 73ff0e6a11b1 b15397a5341c
line wrap: on
line diff