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
..
drops	Lots of spec fixes (mostly namespacing), down to 107 failing specs.	2011-11-26 17:24:34 +11:00
filters	Fixed some failing dragonfly specs.	2011-11-27 19:02:20 +11:00
tags	Lots of spec fixes (mostly namespacing), down to 107 failing specs.	2011-11-26 17:24:34 +11:00