diff test/functional/journals_controller_test.rb @ 635:de8f268e7f12 cannam

Merge from branch "live"
author Chris Cannam
date Tue, 06 Sep 2011 09:48:31 +0100
parents cbce1fd3b1b7
children 433d4f72a19b
line wrap: on
line diff