]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorMatteo Beccati <mbeccati@php.net>
Tue, 28 Apr 2015 09:08:46 +0000 (11:08 +0200)
committerMatteo Beccati <mbeccati@php.net>
Tue, 28 Apr 2015 09:08:46 +0000 (11:08 +0200)
* PHP-5.6:
  Fix segfault in ext/date since 957aa2

1  2 
ext/date/lib/parse_tz.c

Simple merge