Merge branch 'PHP-5.3' into PHP-5.4

This commit is contained in:
Xinchen Hui 2012-12-13 10:44:56 +08:00
commit 1f516510b7

View File

@ -4,7 +4,7 @@
+----------------------------------------------------------------------+
| Copyright (c) 1997-2012 The PHP Group |
+----------------------------------------------------------------------+
| This source file is SplSubject to version 3.01 of the PHP 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 |
| available through the world-wide-web at the following url: |
| http://www.php.net/license/3_01.txt |