Merge branch 'PHP-5.6'

kaplanlior · kaplanlior · commit 128eda843f7d · 2014-07-21T01:50:51.000+03:00
* PHP-5.6:
  Enable $ replacement in exif, ldap, pdo_pgsql and tidy
  Update NEWS
diff --git a/.gitattributes b/.gitattributes
@@ -22,6 +22,10 @@ sapi/nsapi/nsapi.c              ident
 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
