diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-08-23 13:35:30 +0200 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-08-23 13:35:30 +0200 |
| commit | e4a3696553a7bd1059b994da489617041804abea (patch) | |
| tree | e6fe6aa51281b7369b3148e80d39e6a274b01b0b | |
| parent | d212a5d391a8d4c0de32001175314dbf78b957d1 (diff) | |
| parent | eca4fc69918c856966298435bd1133e55a3c8e58 (diff) | |
| download | php-git-e4a3696553a7bd1059b994da489617041804abea.tar.gz | |
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
0 files changed, 0 insertions, 0 deletions