diff app/models/user.rb @ 222:45c691a2b709 feature_20

Merge
author Chris Cannam
date Tue, 15 Feb 2011 12:00:40 +0000
parents 69ee2e406f71
children b859cc0c4fa1 440c4f4bf2d6
line wrap: on
line diff