bf5ac9965f12840d469ef2a4a16e8205dbbe5253 a4bdc00fec623f72592e663e6d7830eea0bc6ea4 Pratik Naik pratiknaik@gmail.com http://github.com/lifo/docrails/commit/2fe263bb328c20539f2970057f31e567ec4ab7c8 2fe263bb328c20539f2970057f31e567ec4ab7c8 2009-07-03T05:01:39-07:00 2009-07-03T05:01:39-07:00 Merge commit 'mainstream/master' Conflicts: actionpack/lib/action_controller.rb actionpack/lib/action_controller/base/base.rb actionpack/lib/action_view/template/path.rb activesupport/lib/active_support/json/encoders/hash.rb 63e85164fb09aca6beb78e1a5c52424fa49ed098 Pratik Naik pratiknaik@gmail.com