Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Use the NEWS merge driver if available

Author: dsp

.gitattributes

@@ -21,4 +21,4 @@ sapi/nsapi/nsapi.c              ident
 sapi/continuity/capi.c          ident
 Zend/RFCs/002.txt               ident
 Zend/RFCs/003.txt               ident
-NEWS                            merge=ours
+NEWS                            merge=NEWS