summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2016-02-15 16:53:31 +0100
committerAnatol Belski <ab@php.net>2016-02-15 16:53:31 +0100
commit7faf625ff3f2bc27d399967d3505b44595446913 (patch)
tree9a13903c274792cfe27482053f06a2abcb392820
parent64b16deabab6b5de1d44f913bcc31ac6468ba76f (diff)
parent11102e26534d5a8ff91a50917cca00c51435ffb2 (diff)
downloadphp-git-7faf625ff3f2bc27d399967d3505b44595446913.tar.gz
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6: Fix timelib compat with PHP5
0 files changed, 0 insertions, 0 deletions