diff app/models/user.rb @ 1443:ea2a09a0fd90 cannam

Merge from luisf branch
author Chris Cannam
date Fri, 11 Oct 2013 16:42:44 +0100
parents bb32da3bea34
children 4f746d8966dd 51364c0cd58f
line wrap: on
line diff