diff options
| author | Johannes Schlüter <johannes@php.net> | 2012-11-08 00:03:37 +0100 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2012-11-08 00:03:37 +0100 |
| commit | 9d95f7d2861b22de1144f25ebe9a5891a9d7ca17 (patch) | |
| tree | cbba66d068066b6727dedda5ea7c99f2d93957b9 | |
| parent | 3e7fcd9cab1dace82b28a80097cbb3eb7b851c18 (diff) | |
| parent | 417b1b238fe79aa6a70aa71b4bb473d88a0d097f (diff) | |
| download | php-git-9d95f7d2861b22de1144f25ebe9a5891a9d7ca17.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