Mario Visic 9f56eecd56 Merge branch 'master' into rails_3_1 ... Conflicts: Gemfile Gemfile.lock config/boot.rb		2011-11-27 20:33:45 +11:00
..
locomotive	Merge branch 'master' into rails_3_1	2011-11-27 20:33:45 +11:00
core_ext_spec.rb	Cleaning whitespace on all .rb files so commit diffs from now on will be a bit more readable	2010-07-23 13:09:54 -07:00