diff app/models/journal.rb @ 572:031d70972601 cannam_integration

Merge from feature_36
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Tue, 09 Aug 2011 16:02:08 +0100
parents cbce1fd3b1b7
children cbb26bc654de
line wrap: on
line diff