]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorJulien Pauli <jpauli@php.net>
Wed, 4 Feb 2015 16:39:34 +0000 (17:39 +0100)
committerJulien Pauli <jpauli@php.net>
Wed, 4 Feb 2015 16:39:34 +0000 (17:39 +0100)
* PHP-5.5:
  Revert "Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)"

1  2 
ext/date/php_date.c

Simple merge