Ryan Bates 2160183e86 Merge branch 'master' into 2.0		2011-09-28 13:35:52 -07:00
..
cancan	Merge branch 'master' into 2.0	2011-09-28 13:35:52 -07:00
generators/cancan/ability	fixing ability generator	2011-09-28 11:18:12 -07:00
cancan.rb	ensure Mongoid::Document is defined before loading Mongoid adapter - closes #359	2011-05-17 13:16:33 -04:00