diff test/functional/admin_controller_test.rb @ 641:b4e9410882f1 cannam_integration

Merge from branch "cannam"
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Tue, 06 Sep 2011 12:24:01 +0100
parents af80e5618e9b
children cbb26bc654de
line wrap: on
line diff