diff app/models/user.rb @ 513:c3c01edd24bb cannam

Merge from branch "live"
author Chris Cannam
date Thu, 14 Jul 2011 10:44:50 +0100
parents 753f1380d6bc
children ec7c78040115
line wrap: on
line diff