diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-09-02 15:03:54 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-09-02 15:03:54 -0700 |
| commit | a734acd4398abcbf6130b3d091bcb8a6ce7ec70d (patch) | |
| tree | 5466875f719d4841abdad75188d9d3e80636c1e2 | |
| parent | 70f92aa97e75a9bfa6a0377f9ef0574efcbe6280 (diff) | |
| parent | 5e95b61639911f84f0cb16fb0a968f8c246d8a20 (diff) | |
| download | php-git-a734acd4398abcbf6130b3d091bcb8a6ce7ec70d.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
5.4.34 is next
Conflicts:
configure.in
main/php_version.h
0 files changed, 0 insertions, 0 deletions