]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorJohannes Schlüter <johannes@php.net>
Wed, 13 Jun 2012 08:36:49 +0000 (10:36 +0200)
committerJohannes Schlüter <johannes@php.net>
Wed, 13 Jun 2012 08:36:49 +0000 (10:36 +0200)
* PHP-5.3:
  Merge PHP 5.3.14 NEWS
  re-add 61755 to NEWS


Trivial merge