diff app/models/user.rb @ 398:c4a0942f2897 cannam-pre-20110113-merge

Merge
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Mon, 11 Apr 2011 18:03:30 +0100
parents 440c4f4bf2d6
children 73ff0e6a11b1 b15397a5341c
line wrap: on
line diff