diff app/models/user.rb @ 277:ab672e427b9b feature_73

Merge from branch "feature_72"
author Chris Cannam
date Mon, 21 Mar 2011 16:02:30 +0000
parents 440c4f4bf2d6
children 73ff0e6a11b1 b15397a5341c
line wrap: on
line diff