comparison app/models/user.rb @ 316:cf680b826117 cannam-pre-20110113-merge

Merge from 315:de6af1693ef7
author Chris Cannam
date Mon, 28 Mar 2011 18:07:06 +0100
parents 440c4f4bf2d6
children 73ff0e6a11b1 b15397a5341c
comparison
equal deleted inserted replaced
315:fd027311814a 316:cf680b826117