diff app/models/user.rb @ 187:752184172a34 cannam-pre-20110113-merge

Merge from branch "feature_55"
author Chris Cannam
date Thu, 03 Feb 2011 15:34:57 +0000
parents 69ee2e406f71
children b859cc0c4fa1 440c4f4bf2d6
line wrap: on
line diff