diff app/controllers/members_controller.rb @ 640:47b21bb3fa03 cannam_integration

Merge from branch "feature_36"
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Tue, 06 Sep 2011 12:23:51 +0100
parents d7326bb4f6f0
children 5e80956cc792
line wrap: on
line diff