Merge remote-tracking branch 'remotes/cataphract/strtr_wu94_54' into PHP-5.4

* remotes/cataphract/strtr_wu94_54:
  Fixed inconsequential bug in strtr()
  Remove _GNU_SOURCE, add local heap sort
  The compiler can figure this out
  Remove unused block
  strtr() with 2nd param array - optimization
  Refactoring, bugs & leaks
  Optimize strtr w/ 2nd arg array
NEWS for bug #63893
fixed build
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fixed build
  NEWS for bug #63893

Conflicts:
	NEWS
Merge branch 'PHP-5.5'

* PHP-5.5:
  fixed build
  NEWS for bug #63893
- Fixed ZTS build
Merge branch 'master' of git.php.net:php-src
- Fixed ZTS build
Merge branch 'PHP-5.5'

* PHP-5.5:
  - Fixed ZTS build