Merge branch '2.3' into 2.5

fabpot · fabpot · commit e6184c1a35ae · 2014-11-28T11:00:29.000+01:00
* 2.3:
  [Debug] fix error message on double exception
  Fix initialized() with aliased services
  Rename Symfony2 to Symfony
  backport #12489

Conflicts:
	CONTRIBUTING.md
	src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php
	src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php
diff --git a/Loader/FilesystemLoader.php b/Loader/FilesystemLoader.php
@@ -17,7 +17,7 @@
 
 /**
  * FilesystemLoader extends the default Twig filesystem loader
- * to work with the Symfony2 paths and template references.
+ * to work with the Symfony paths and template references.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`
`18`	`18`	`/**`
`19`	`19`	`* FilesystemLoader extends the default Twig filesystem loader`
`20`		`- * to work with the Symfony2 paths and template references.`
	`20`	`+ * to work with the Symfony paths and template references.`
`21`	`21`	`*`
`22`	`22`	`* @author Fabien Potencier <[email protected]>`
`23`	`23`	`*/`