diff app/models/user.rb @ 231:5d6e2819f3dd cannam-pre-20110113-merge

Merge from branch "feature_20". This initial implementation of #20 has been tested, but needs to be tested again in the proper context.
author Chris Cannam
date Thu, 17 Feb 2011 18:35:11 +0000
parents 440c4f4bf2d6
children 73ff0e6a11b1 b15397a5341c
line wrap: on
line diff