log app/models/.svn/text-base/user.rb.svn-base @ 851:2f5046e94b6d bug_255

age author description
Mon, 06 Jun 2011 14:41:04 +0100 Chris Cannam Merge from branch "redmine-1.2" cannam