diff app/models/user.rb @ 1003:96f4b03623ed live

Merge from branch "cannam"
author Chris Cannam
date Fri, 09 Nov 2012 14:55:35 +0000
parents ec1c49528f36
children bb32da3bea34
line wrap: on
line diff