]> granicus.if.org Git - php/commit
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)
commite4a3696553a7bd1059b994da489617041804abea
treee6fe6aa51281b7369b3148e80d39e6a274b01b0b
parentd212a5d391a8d4c0de32001175314dbf78b957d1
parenteca4fc69918c856966298435bd1133e55a3c8e58
Merge branch 'PHP-5.3' into PHP-5.4

* 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