Merge branch '2.5' into 2.6

fabpot · fabpot · commit 1d3a5c642296 · 2015-01-07T22:37:14.000+01:00
* 2.5:
  fixed typo
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
@@ -216,7 +216,7 @@ private function getContainerDefinitionData(Definition $definition, $omitTags =
             'synthetic' => $definition->isSynthetic(),
             'lazy' => $definition->isLazy(),
             'synchronized' => $definition->isSynchronized(),
-            'abstract' => $definition->isSynchronized(),
+            'abstract' => $definition->isAbstract(),
             'file' => $definition->getFile(),
         );
 
