diff app/models/user.rb @ 284:23c69f60a959 cannam-pre-20110113-merge

Merge from branch "bug_95"
author Chris Cannam
date Wed, 23 Mar 2011 11:19:50 +0000
parents 440c4f4bf2d6
children 73ff0e6a11b1 b15397a5341c
line wrap: on
line diff