diff app/models/journal.rb @ 313:862e47cc1e09 live

Merge from branch "bug_97"
author Chris Cannam
date Mon, 28 Mar 2011 18:04:17 +0100
parents 40f7cfd4df19
children cbce1fd3b1b7
line wrap: on
line diff