]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
authorChristopher Jones <sixd@php.net>
Wed, 10 Jul 2013 18:13:18 +0000 (11:13 -0700)
committerChristopher Jones <sixd@php.net>
Wed, 10 Jul 2013 18:13:18 +0000 (11:13 -0700)
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Merge PHP 5.3.27 NEWS
  add test for bug #65236
  fix possible resource leak and make sure there's something to qsort()
  - Updated to version 2013.4 (2013d)


Trivial merge