Merge branch 'PHP-5.6'

reeze · reeze · commit 7109a39ddb3b · 2015-03-01T15:15:03.000+08:00
* PHP-5.6:
  Bump header year
  Update NEWS

Conflicts:
	NEWS
diff --git a/header b/header
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 7                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2014 The PHP Group                                |
+  | Copyright (c) 1997-2015 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
