Ryan Bates 5d8f04363d merging with master and resolving a couple conflicts		2010-07-19 16:36:01 -07:00
..
cancan	merging with master and resolving a couple conflicts	2010-07-19 16:36:01 -07:00
spec_helper.rb	add tests for merging conditions and joins	2010-05-25 14:02:26 +04:00
spec.opts	supporting deeply nested aliases - closes #98	2010-07-19 16:03:09 -07:00