Merge branch '2.6' into 2.7

xabbuh · xabbuh · commit 9755846f95c9 · 2015-07-16T00:04:16.000+02:00
diff --git a/cookbook/security/voters_data_permission.rst b/cookbook/security/voters_data_permission.rst
@@ -111,7 +111,8 @@ edit a particular object. Here's an example implementation:
                     }
 
                     break;
-
+            }
+            
             return false;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,8 @@ edit a particular object. Here's an example implementation:`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`break;`
`114`		`-`
	`114`	`+ }`
	`115`	`+`
`115`	`116`	`return false;`
`116`	`117`	`}`
`117`	`118`	`}`