Merge branch '2.0' into 2.1

fabpot · fabpot · commit fefb3448e7a0 · 2013-01-04T18:00:54.000+01:00
* 2.0: updated license year Update src/Symfony/Component/HttpFoundation/Response.php [Console] fixed unitialized properties (closes symfony#5935) [Bundle] [FrameworkBundle] fixed typo in phpdoc of the SessionListener. bumped Symfony version to 2.0.21-DEV updated VERSION for 2.0.21 updated CHANGELOG for 2.0.21 Conflicts: src/Symfony/Bundle/SwiftmailerBundle/LICENSE src/Symfony/Component/Filesystem/LICENSE src/Symfony/Component/HttpFoundation/Response.php src/Symfony/Component/HttpKernel/Kernel.php
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2012 Fabien Potencier
+Copyright (c) 2004-2013 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright (c) 2004-2012 Fabien Potencier`
	`1`	`+Copyright (c) 2004-2013 Fabien Potencier`
`2`	`2`
`3`	`3`	`Permission is hereby granted, free of charge, to any person obtaining a copy`
`4`	`4`	`of this software and associated documentation files (the "Software"), to deal`