Raphael fd8028db33 Revert "Revert "Merge remote branch 'upstream/master'"" ... This reverts commit 1481056af2.		2010-10-20 09:51:55 -07:00
..
controllers	Revert "Revert "Merge remote branch 'upstream/master'""	2010-10-20 09:51:55 -07:00
fixtures
helpers
lib	Revert "Revert "Merge remote branch 'upstream/master'""	2010-10-20 09:51:55 -07:00
models	Revert "Revert "Merge remote branch 'upstream/master'""	2010-10-20 09:51:55 -07:00
factories.rb
misc_spec.rb	Revert "Revert "Merge remote branch 'upstream/master'""	2010-10-20 09:51:55 -07:00
spec_helper.rb	Revert "Revert "Merge remote branch 'upstream/master'""	2010-10-20 09:51:55 -07:00
user_encryption_spec.rb