diff app/models/user.rb @ 85:22c68d60853d cannam

Merge from branch "live"
author Chris Cannam
date Thu, 16 Dec 2010 10:07:06 +0000
parents 69ee2e406f71
children b859cc0c4fa1 440c4f4bf2d6
line wrap: on
line diff