diff app/models/user.rb @ 1429:5b52161fb034 cannam

Merge from luisf branch
author Chris Cannam
date Wed, 09 Oct 2013 17:37:40 +0100
parents bb32da3bea34
children 4f746d8966dd 51364c0cd58f
line wrap: on
line diff