Jeremy Kemper 657898c821 Merge commit 'sven/i18n' ... Conflicts: activesupport/lib/active_support.rb		2008-08-27 12:31:07 -07:00
..
active_support	Merge commit 'sven/i18n'	2008-08-27 12:31:07 -07:00
active_support.rb	Merge commit 'sven/i18n'	2008-08-27 12:31:07 -07:00
activesupport.rb	Allow frameworks to be required by their gem name (closes #8845) [drnic]	2007-09-22 18:15:05 +00:00