Merge branch '2.3' into 2.4

weaverryan · weaverryan · commit 112d16b68747 · 2013-11-28T12:04:45.000-06:00
Conflicts:
	cookbook/logging/monolog_regex_based_excludes.rst
diff --git a/cookbook/logging/monolog_regex_based_excludes.rst b/cookbook/logging/monolog_regex_based_excludes.rst
@@ -8,8 +8,7 @@ How to Configure Monolog to Exclude 404 Errors from the Log
 
 .. versionadded:: 2.4
     This feature was introduced to the MonologBundle in version 2.4, which
-    was first packaged with Symfony at version 2.4. However, the 2.4 version
-    of the MonologBundle is also compatible with Symfony 2.3.
+    was first packaged with Symfony at version 2.4.
 
 Sometimes your logs become flooded with unwanted 404 HTTP errors, for example,
 when an attacker scans your app for some well-known application paths (e.g.
