]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 19ad138 b5e5098)
Merge branch 'PHP-5.5' into PHP-5.6
authorMatteo Beccati <mbeccati@php.net>
Tue, 28 Apr 2015 08:57:52 +0000 (10:57 +0200)
committerMatteo Beccati <mbeccati@php.net>
Tue, 28 Apr 2015 08:57:52 +0000 (10:57 +0200)
* PHP-5.5:
  Fix segfault in ext/date since 957aa2

1  2 
ext/date/lib/parse_tz.c patch | diff1 | diff2 | blob | history

diff --cc ext/date/lib/parse_tz.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.