Merge branch 'PHP-5.4' into PHP-5.5

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

diff --cc .gitattributes
index 79b218fcbacfea8b0526f0fafb2d9a9152b3f185,a44aa5d2cd8b3aca352b7894a3d38440a8cc306c..091043a35b4ca2e6002da50d9427d28d799abe1c
--- 1/.gitattributes
--- 2/.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