Xavier Noria af1b48926f Merge branch 'master' of git://github.com/lifo/docrails ... Conflicts: activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb		2011-04-23 01:11:24 +02:00
..
active_support	Grammar fixes for Object#in? documentation.	2011-04-22 15:14:14 +08:00
active_support.rb	File watcher won't make the cut for 3.1. Maybe on 3.2.	2011-04-23 00:00:30 +02:00