diff app/models/user.rb @ 352:13147268cd65 cannam-pre-20110113-merge

Merge from branch "feature_123"
author Chris Cannam
date Thu, 31 Mar 2011 18:21:19 +0100
parents 440c4f4bf2d6
children 73ff0e6a11b1 b15397a5341c
line wrap: on
line diff