comparison app/models/user.rb @ 377:0802551af0a5 live

Merge from branch "feature_126"
author Chris Cannam
date Fri, 01 Apr 2011 17:24:48 +0100
parents 440c4f4bf2d6
children 73ff0e6a11b1 b15397a5341c
comparison
equal deleted inserted replaced
373:c2230be27b7e 377:0802551af0a5