diff options
| author | Johannes Schlüter <johannes@php.net> | 2012-12-05 19:02:41 +0100 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2012-12-05 19:02:41 +0100 |
| commit | 811cd765a90f0d952b09947135275d7495e4e7a4 (patch) | |
| tree | a525e310a0d4001c6aad77dff1d5a6526284edea | |
| parent | df97c3aa0d331be668bd5d8f27fff96d4e3ac1d7 (diff) | |
| parent | 22fe268ad4c22ec55bc2c74db18b3cae8f8a6176 (diff) | |
| download | php-git-811cd765a90f0d952b09947135275d7495e4e7a4.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
Conflicts:
configure.in
main/php_version.h
0 files changed, 0 insertions, 0 deletions