Marcelo Silveira 32991e13c4 Merge and fix conflicts.		2010-01-09 11:22:27 -02:00
..
routes.rb	Merge and fix conflicts.	2010-01-09 11:22:27 -02:00
warden_compat.rb	Do not store mappings since they can change by scope in serializers.	2009-11-15 02:13:54 -02:00