]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d212a5d eca4fc6)
Merge branch 'PHP-5.3' into PHP-5.4
authorAnatoliy Belsky <ab@php.net>
Thu, 23 Aug 2012 11:35:30 +0000 (13:35 +0200)
committerAnatoliy Belsky <ab@php.net>
Thu, 23 Aug 2012 11:35:30 +0000 (13:35 +0200)
* PHP-5.3:
  ZTS fix introduced by Felipe must also go into 5.3
  Updated INSTALL. Generated from the XML Docs.
  Update NEWS given a5d0c1e2

Conflicts:
NEWS


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.