annotate app/models/.svn/prop-base/member_role.rb.svn-base @ 785:32d853e2e7ed cannam

Merge from branch "feature_14"
author Chris Cannam
date Fri, 18 Nov 2011 16:18:52 +0000
parents 513646585e45
children
rev   line source
Chris@0 1 K 13
Chris@0 2 svn:eol-style
Chris@0 3 V 6
Chris@0 4 native
Chris@0 5 END