diff options
| author | Julien Pauli <jpauli@php.net> | 2015-07-08 17:00:29 +0200 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2015-07-08 17:00:29 +0200 |
| commit | b1a9b897734865468602964b339422a39916b907 (patch) | |
| tree | 3440e1edfdefa118c6d823d533811a7e03cfcfc4 | |
| parent | c75d245e82ecea5e1c57ad63d5f81de7a2c3045f (diff) | |
| parent | 34b624f122dd7b0ef31707532cb11cfc2bdf50f7 (diff) | |
| download | php-git-b1a9b897734865468602964b339422a39916b907.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
5.5.27 release
Conflicts:
main/php_version.h
0 files changed, 0 insertions, 0 deletions