Merge branch 'PHP-5.3' into PHP-5.4 · php/php-src@e4a3696 · GitHub

Commit

Merge branch 'PHP-5.3' into PHP-5.4

Browse files

* PHP-5.3:
  ZTS fix introduced by Felipe must also go into 5.3
  Updated INSTALL. Generated from the XML Docs.
  Update NEWS given a5d0c1e

Conflicts:
	NEWS

Loading branch information

weltling committed Aug 23, 2012

2 parents d212a5d + eca4fc6 commit e4a3696