diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-03-18 23:24:09 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-03-18 23:24:09 -0700 |
| commit | 1ff28cd0ec954fc3ab69c239a945a99d4f09c5b1 (patch) | |
| tree | 73dd88813e894df905e060f010186e346442fc99 | |
| parent | 2dfb8fbdf4f73f7a1f7f3abf86aff0425637bc0a (diff) | |
| parent | 9b88bc494e5e749039bd0166723b6b0a35de5a3e (diff) | |
| download | php-git-1ff28cd0ec954fc3ab69c239a945a99d4f09c5b1.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
prep for 5.4.27 rc1
Conflicts:
configure.in
main/php_version.h
0 files changed, 0 insertions, 0 deletions