diff app/models/member_role.rb @ 723:d41bf754c0f2 feature_14

Merge from branch "live"
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Thu, 20 Oct 2011 16:36:48 +0100
parents 513646585e45
children cbb26bc654de
line wrap: on
line diff