diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-01-03 17:27:19 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-01-03 17:27:19 -0800 |
| commit | a72102f267b3e4782e186e30c52b14454e2fa499 (patch) | |
| tree | e9e3eafbe1e1000cba2c5ca90efd6c4c954fcbeb | |
| parent | ff6b9a4b680b6a87570783ba6fbed445c97cea43 (diff) | |
| parent | 5894aa09503eb700b1779d0d6c41b3e2ae698722 (diff) | |
| download | php-git-a72102f267b3e4782e186e30c52b14454e2fa499.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
5.4.12-dev
This will be PHP 5.3.22
Conflicts:
configure.in
main/php_version.h
0 files changed, 0 insertions, 0 deletions