]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Tue, 28 Oct 2014 07:50:48 +0000 (08:50 +0100)
committerRemi Collet <remi@php.net>
Tue, 28 Oct 2014 07:50:48 +0000 (08:50 +0100)
* PHP-5.5:
  Ensure we have enough input data before parsing date


Trivial merge