diff app/models/user.rb @ 355:9ccc63655a21 live

Merge from branch "feature_123"
author Chris Cannam
date Fri, 01 Apr 2011 09:37:25 +0100
parents 440c4f4bf2d6
children 73ff0e6a11b1 b15397a5341c
line wrap: on
line diff