From: Stanislav Malyshev <stas@php.net>
Date: Mon, 14 Apr 2014 17:51:34 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0beta2~1^2~67^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1bd38411327da74bdb23bc05d5d1d1aa4dbb6293;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix null byte in LDAP bindings
  Fix bug #66171: better handling of symlinks
  Fix null byte in LDAP bindings
  Fix bug #66171: better handling of symlinks
---

1bd38411327da74bdb23bc05d5d1d1aa4dbb6293