]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorDmitry Stogov <dmitry@zend.com>
Tue, 14 Apr 2015 14:16:57 +0000 (17:16 +0300)
committerDmitry Stogov <dmitry@zend.com>
Tue, 14 Apr 2015 14:16:57 +0000 (17:16 +0300)
* PHP-5.5:
  Bug #63336 is not a bug


Trivial merge