diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-08-25 15:13:17 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-08-25 15:14:17 -0700 |
| commit | 825a505494555e60c6cb3a32bc90de9d026420b9 (patch) | |
| tree | 9c922eadb3a18fa57ab83d2d2d530f65ad3a336a /ext/standard/php_fopen_wrapper.c | |
| parent | e045cbaa1447489cd38fc8bc827563bc39148075 (diff) | |
| parent | e6424d89e9419e610ea95484081b9c26b0a7c044 (diff) | |
| download | php-git-825a505494555e60c6cb3a32bc90de9d026420b9.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #65554 in DateTime, when use it with D/l in format and textual day have dot at the end
Conflicts:
ext/date/lib/parse_date.c
ext/date/lib/parse_date.re
Diffstat (limited to 'ext/standard/php_fopen_wrapper.c')
0 files changed, 0 insertions, 0 deletions