]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Tue, 28 Apr 2015 12:38:45 +0000 (14:38 +0200)
committerAnatol Belski <ab@php.net>
Tue, 28 Apr 2015 12:38:45 +0000 (14:38 +0200)
* PHP-5.5:
  fix VC9 build with PCRE
  Revert "Fix segfault in ext/date since 957aa2"


Trivial merge