Xavier Noria 5e21247131 Merge branch 'master' of git://github.com/lifo/docrails ... Conflicts: activerecord/RUNNING_UNIT_TESTS		2011-06-06 22:23:30 +02:00
..
active_model	Merge branch 'master' of git://github.com/lifo/docrails	2011-06-06 22:23:30 +02:00
active_model.rb	We're in 2011, let's update our license	2011-02-22 18:24:20 -02:00