diff app/models/user.rb @ 923:bd2afdf7e446 cannam

Merge from branch "live"
author Chris Cannam
date Tue, 13 Mar 2012 16:34:07 +0000
parents ec7c78040115
children 5e80956cc792
line wrap: on
line diff