diff app/models/.svn/text-base/mailer.rb.svn-base @ 136:bf38a7365edf live

Merge fixes for bug #51 and bug #35 from branch "cannam-pre-20110113-merge"
author Chris Cannam
date Wed, 19 Jan 2011 15:34:59 +0000
parents 94944d00e43c
children 0579821a129a
line wrap: on
line diff