]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorAnatoliy Belsky <ab@php.net>
Thu, 23 Aug 2012 11:36:20 +0000 (13:36 +0200)
committerAnatoliy Belsky <ab@php.net>
Thu, 23 Aug 2012 11:36:20 +0000 (13:36 +0200)
* PHP-5.4:
  ZTS fix introduced by Felipe must also go into 5.3
  Updated INSTALL. Generated from the XML Docs.
  Update NEWS given a5d0c1e2


Trivial merge