From: Lior Kaplan <kaplanlior@gmail.com>
Date: Sun, 20 Jul 2014 22:47:19 +0000 (+0300)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.16RC1~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=842fde2827394e68b3ddde0cee6462a3b19d63f9;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Enable $ replacement in exif, ldap, pdo_pgsql and tidy
  Update NEWS
---

842fde2827394e68b3ddde0cee6462a3b19d63f9
diff --cc .gitattributes
index 79b218fcba,a44aa5d2cd..091043a35b
--- a/.gitattributes
+++ b/.gitattributes
@@@ -22,9 -22,11 +22,13 @@@ sapi/nsapi/nsapi.c              iden
  sapi/continuity/capi.c          ident
  Zend/RFCs/002.txt               ident
  Zend/RFCs/003.txt               ident
+ ext/exif/exif.c                 ident
+ ext/ldap/ldap.c                 ident
+ ext/pdo_pgsql/pdo_pgsql.c       ident
+ ext/tidy/tidy.c                 ident
  NEWS                            merge=NEWS
 +UPGRADING                       merge=NEWS
 +UPGRADING.INTERNALS             merge=NEWS
  /ext/bz2/tests/with_strings.phpt	-crlf
  /ext/dom/tests/bug40836.phpt	-crlf
  /ext/dom/tests/domelement.phpt	-crlf