Merge branch 'patch-1' of git://github.com/grk/nested_form into rails31

Author: fxposter

Diff for: lib/nested_form/builder_mixin.rb

@@ -48,12 +48,16 @@ def link_to_remove(*args, &block)
       hidden_field(:_destroy) + @template.link_to(*args, &block)
     end
 
-    def fields_for_with_nested_attributes(association_name, args, block)
+    def fields_for_with_nested_attributes(association_name, *args, block)
       # TODO Test this better
       block ||= Proc.new { |fields| @template.render(:partial => "#{association_name.to_s.singularize}_fields", :locals => {:f => fields}) }
       @fields ||= {}
       @fields[association_name] = block
-      super(association_name, args, block)
+      if Rails::VERSION::MAJOR >= 3 && Rails::VERSION::MINOR >= 1
+        super(association_name, args.first, args.last, block)
+      else
+        super(association_name, *args, block)
+      end
     end
 
     def fields_for_nested_model(name, object, options, block)