diff options
| author | Julien Pauli <jpauli@php.net> | 2015-06-09 10:35:42 +0200 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2015-06-09 10:35:42 +0200 |
| commit | 0bfb454acb00d3070837c7623f458913a47325e8 (patch) | |
| tree | 1a89ef28f9947c8fd01da712dbe87c13cf87e048 | |
| parent | 5eecc6bcdee157aa7cb11691755bfd42007ead29 (diff) | |
| parent | 5f7c1917e3ab7ef7120dba6b2a3c46601781ea22 (diff) | |
| download | php-git-0bfb454acb00d3070837c7623f458913a47325e8.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
5.5.27 now
Conflicts:
configure.in
main/php_version.h
0 files changed, 0 insertions, 0 deletions