Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixes #66764 -  configure doesn't define EXPANDED_DATADIR / PHP_DATADIR correctly

diff --cc NEWS
index d1c3f5a33babcd2b3d6c4ae46efaf61a28d0a34f,4879a9e221a3801947be414fd09fb7fa6a24e741..0f0abb81fcdb251bbb11d96c43bf7ca42c53e36c
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -12,9 -13,11 +12,11 @@@
    . Fixed bug #68297 (Application Popup provides too few information). (Anatol)
    . Fixed bug #65769 (localeconv() broken in TS builds). (Anatol)
    . Fixed bug #65230 (setting locale randomly broken). (Anatol)
+   . Fixed bug #66764 (configure doesn't define EXPANDED_DATADIR / PHP_DATADIR
+     correctly). (Ferenc)
    . Fixed bug #68583 (Crash in timeout thread). (Anatol)
 -  . Fixed bug #68594 (Use after free vulnerability in unserialize()).
 -    (CVE-2014-8142) (Stefan Esser)
 +  . Fixed bug #65576 (Constructor from trait conflicts with inherited
 +    constructor). (dunglas at gmail dot com)
    . Fixed bug #68676 (Explicit Double Free). (Kalle)
  
  - CGI:

diff --cc configure.in
Simple merge