diff options
| author | Julien Pauli <jpauli@php.net> | 2015-09-02 17:42:00 +0200 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2015-09-02 17:42:00 +0200 |
| commit | c07150cd1a11d3bed7e88068869d515f91d980b5 (patch) | |
| tree | dc1ddf3c8d0a83bfd143fffe5cb63a430ae78830 | |
| parent | a6c063d663182647b522d5e36ca537e4ed699c60 (diff) | |
| parent | ea807f9c07e841ff1a3fbfbada1423d66731ad7b (diff) | |
| download | php-git-c07150cd1a11d3bed7e88068869d515f91d980b5.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
5.5.30 next
Conflicts:
configure.in
main/php_version.h
0 files changed, 0 insertions, 0 deletions