Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  readline can output control codes
  Bug #55694: Update readline test to support attempted_completion_over variable
  Bug #55694: Expose attempted_completion_over variable from readline library

diff --cc NEWS
index d10d3f69d207ba142443afd3453800f7fbde2037,70188f5a56c7cd3acf909c2394ca82f69791018f..e56e6f69268f69e8eafc5d4ea1af4e552ea4ed40
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -18,6 -24,21 +18,10 @@@ PH
    . Fixed bug #63176 (Segmentation fault when instantiate 2 persistent PDO to 
      the same db server). (Laruence)
  
 -- PDO_DBlib:
 -  . Fixed bug #63638 (Cannot connect to SQL Server 2008 with PDO dblib). 
 -    (Stanley Sufficool)
 -  . Fixed bug #64338 (pdo_dblib can't connect to Azure SQL). (Stanley 
 -    Sufficool)
 -  . Fixed bug #64808 (FreeTDS PDO getColumnMeta on a prepared but not executed 
 -    statement crashes). (Stanley Sufficool)
 -
 -- PDO_pgsql:
 -  . Fixed Bug #64949 (Buffer overflow in _pdo_pgsql_error). (Remi)
 -
+ - Readline:
 -  . Implement FR #55694 (Expose additional readline variable to prevent 
++  . Implement FR #55694 (Expose additional readline variable to prevent
+     default filename completion). (Hartmel)
+ 
  - SPL:
    . Fixed bug #64997 (Segfault while using RecursiveIteratorIterator on
      64-bits systems). (Laruence)