diff app/models/user.rb @ 434:dcf38f417f1f live

Merge from branch "bug_168"
author Chris Cannam
date Mon, 06 Jun 2011 10:57:11 +0100
parents 440c4f4bf2d6
children 73ff0e6a11b1 b15397a5341c
line wrap: on
line diff