comparison app/models/user.rb @ 311:0a829eae7cf3 live

Merge from branch "feature_74"
author Chris Cannam
date Mon, 28 Mar 2011 17:50:43 +0100
parents 440c4f4bf2d6
children 73ff0e6a11b1 b15397a5341c
comparison
equal deleted inserted replaced
310:b9c2ba9e49b4 311:0a829eae7cf3