Mario Visic eb5f0557ff Merge branch 'master' into rails_3_1 ... Conflicts: app/models/content_instance.rb spec/models/locomotive/content_instance_spec.rb		2011-12-18 01:18:56 +08:00
..
locomotive	Merge branch 'master' into rails_3_1	2011-12-18 01:18:56 +08:00