diff app/models/user.rb @ 1214:c212850aec6e cannam

Merge from branch "live"
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Tue, 12 Mar 2013 10:21:45 +0000
parents ec1c49528f36
children bb32da3bea34
line wrap: on
line diff