diff options
author | Ferenc Kovacs <tyrael@php.net> | 2015-01-02 10:16:37 +0100 |
---|---|---|
committer | Ferenc Kovacs <tyrael@php.net> | 2015-01-02 10:16:37 +0100 |
commit | c3b44b1175c880c118132b5d12cbff9f2aaa4f65 (patch) | |
tree | 69b4d8547e4a8f15ca589fc17e168b8b50a25e86 /ext/mysqlnd/mysqlnd_debug.c | |
parent | 95e04fed242ac37b950e935a51be7171ec140fb2 (diff) | |
parent | fe46966678db3b82b66b715d37c6254d81dbe568 (diff) | |
download | php-git-c3b44b1175c880c118132b5d12cbff9f2aaa4f65.tar.gz |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixes #67960 - Long/short day names reversed in jddayofweek()
Conflicts:
ext/calendar/calendar.c
Diffstat (limited to 'ext/mysqlnd/mysqlnd_debug.c')
0 files changed, 0 insertions, 0 deletions