From: Gustavo Lopes <glopes@nebm.ist.utl.pt>
Date: Tue, 15 Jan 2013 20:45:22 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/cataphract/strtr_wu94_55' into PHP-5.5
X-Git-Tag: php-5.5.0alpha5~64
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1bd193ed36d413f0d919856f65feb35a0b1580f3;p=php

Merge remote-tracking branch 'remotes/cataphract/strtr_wu94_55' into PHP-5.5

* remotes/cataphract/strtr_wu94_55:
  Fixed inconsequential bug in strtr()
  UPGRADING.INTERNALS: document zend_qsort_r
  Add zend_qsort_r & use it in strtr
  NEWS for bug #63893
  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
---

1bd193ed36d413f0d919856f65feb35a0b1580f3