summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2014-04-14 10:46:52 -0700
committerStanislav Malyshev <stas@php.net>2014-04-14 10:46:52 -0700
commit5b8c4b8de5a982c1c86e118d9ffcd78aa29dc738 (patch)
tree5ca065e59cfaef12f07bd47c69450e4e9c2c433c
parented4de188dd1c15d278a8250e6be3cba142bba6af (diff)
parentad1b9eef98df53adefa0c79c02e5dc1f2b928b8c (diff)
downloadphp-git-5b8c4b8de5a982c1c86e118d9ffcd78aa29dc738.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: Fix null byte in LDAP bindings Fix bug #66171: better handling of symlinks
0 files changed, 0 insertions, 0 deletions