Merge branch '2.0' into 2.1

weaverryan · weaverryan · commit 5ca26e1ece3c · 2013-04-26T09:16:42.000-05:00
diff --git a/reference/forms/types/repeated.rst b/reference/forms/types/repeated.rst
@@ -186,5 +186,3 @@ These options inherit from the :doc:`field</reference/forms/types/field>` type:
 .. include:: /reference/forms/types/options/invalid_message.rst.inc
 
 .. include:: /reference/forms/types/options/invalid_message_parameters.rst.inc
-
-.. include:: /reference/forms/types/options/error_bubbling.rst.inc
