diff app/models/user.rb @ 818:6973eeea55ac live

Merge from branch "luisf"
author Chris Cannam
date Wed, 23 Nov 2011 16:11:37 +0000
parents ec7c78040115
children 5e80956cc792
line wrap: on
line diff