Raphael a23df47dbc Trying to merge in the pivots changes that we want in master		2010-08-18 21:10:42 -07:00
..
controllers	Trying to merge in the pivots changes that we want in master	2010-08-18 21:10:42 -07:00
fixtures
helpers
lib
models	Trying to merge in the pivots changes that we want in master	2010-08-18 21:10:42 -07:00
factories.rb
misc_spec.rb
spec_helper.rb
user_encryption_spec.rb