diff app/models/user.rb @ 848:aa0ad9ab384b live

Merge from branch "cannam"
author Chris Cannam
date Wed, 01 Feb 2012 14:35:56 +0000
parents ec7c78040115
children 5e80956cc792
line wrap: on
line diff