ccocchi 1a98d69146 Merge branch 'master' into responder ... Conflicts: lib/rabl-rails.rb		2012-09-11 11:42:19 +02:00
..
rabl-rails	Merge branch 'master' into responder	2012-09-11 11:42:19 +02:00
tasks	rabl-fast-json => rabl-rails	2012-04-20 16:28:34 +02:00
rabl-rails.rb	Merge branch 'master' into responder	2012-09-11 11:42:19 +02:00