Merge branch 'PHP-5.6' into PHP-7.0

This commit is contained in:
Christopher Jones 2016-04-14 15:09:02 +10:00
commit 96ece22a05

View file

@ -4,11 +4,11 @@
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| Copyright (c) 2013 Zend Technologies Ltd. (http://www.zend.com) | | Copyright (c) 2013 Zend Technologies Ltd. (http://www.zend.com) |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| This source file is subject to version 3.01 of the Zend license, | | 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 | | that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: | | available through the world-wide-web at the following url: |
| http://www.zend.com/license/3_01.txt. | | http://www.php.net/license/3_01.txt. |
| If you did not receive a copy of the Zend license and are unable to | | If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to | | obtain it through the world-wide-web, please send a note to |
| license@zend.com so we can mail you a copy immediately. | | license@zend.com so we can mail you a copy immediately. |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+