comparison app/models/user.rb @ 189:b55279e641b8 cannam-pre-20110113-merge

Merge from branch "feature_55"
author Chris Cannam
date Thu, 03 Feb 2011 15:55:45 +0000
parents 69ee2e406f71
children b859cc0c4fa1 440c4f4bf2d6
comparison
equal deleted inserted replaced
187:752184172a34 189:b55279e641b8