From: Stanislav Malyshev <stas@php.net>
Date: Mon, 14 Apr 2014 17:46:52 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.12RC1~5^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5b8c4b8de5a982c1c86e118d9ffcd78aa29dc738;p=php

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
---

5b8c4b8de5a982c1c86e118d9ffcd78aa29dc738