comparison app/models/user.rb @ 139:ddcedb549d4e cannam-pre-20110113-merge

Merge from live branch
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Thu, 20 Jan 2011 10:00:51 +0000
parents 69ee2e406f71
children b859cc0c4fa1 440c4f4bf2d6
comparison
equal deleted inserted replaced
135:6a2f8e88344e 139:ddcedb549d4e