Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Revert unintentional docblock change
This commit is contained in:
Adam Harvey 2014-12-05 13:57:46 -08:00
commit 79131b4617

View File

@ -10,7 +10,7 @@
| http://www.php.net/license/3_01.txt |
| 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 |
| license@php.net so we can mail you 6 copy immediately. |
| license@php.net so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Author: Sterling Hughes <sterling@php.net> |
+----------------------------------------------------------------------+