Merge branch '2.3' into 2.5

* 2.3:
  Use PHPUnit ini_set wrapper in tests
  [Process] Added a test skip check for Windows
  [Process] Removed unused variable assignment
  Fixes various phpdoc and coding standards.
  Fixes Issue #13184 - incremental output getters now return empty strings
  Updated copyright to 2015

Conflicts:
	src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php
	src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php
	src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
	src/Symfony/Component/Debug/ExceptionHandler.php
	src/Symfony/Component/Process/Tests/AbstractProcessTest.php

2 files changed, 4 insertions, 2 deletions

diff --git a/Core/Util/ClassUtils.php b/Core/Util/ClassUtils.php
index 0585204..6107c40 100644
--- a/Core/Util/ClassUtils.php
+++ b/Core/Util/ClassUtils.php
@@ -11,11 +11,13 @@
 
 namespace Symfony\Component\Security\Core\Util;
 
+use Doctrine\Common\Util\ClassUtils as DoctrineClassUtils;
+
 /**
  * Class related functionality for objects that
  * might or might not be proxy objects at the moment.
  *
- * @see Doctrine\Common\Util\ClassUtils
+ * @see DoctrineClassUtils
  *
  * @author Benjamin Eberlei <kontakt@beberlei.de>
  * @author Johannes Schmitt <schmittjoh@gmail.com>
diff --git a/LICENSE b/LICENSE
index 0b3292c..43028bc 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2014 Fabien Potencier
+Copyright (c) 2004-2015 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