Yura Sokolov 46f03013f3 Merge remote branch 'upstream/master' ... Conflicts: lib/cancan/ability.rb lib/cancan/active_record_additions.rb lib/cancan/can_definition.rb spec/cancan/ability_spec.rb		2010-05-24 15:17:10 +04:00
..
cancan	Merge remote branch 'upstream/master'	2010-05-24 15:17:10 +04:00
spec_helper.rb	improving inline documentation	2010-05-21 13:41:24 -07:00