]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6.19
authorStanislav Malyshev <stas@php.net>
Wed, 2 Mar 2016 06:55:49 +0000 (22:55 -0800)
committerStanislav Malyshev <stas@php.net>
Wed, 2 Mar 2016 06:55:49 +0000 (22:55 -0800)
commit6e6a556b8c8e192ab44edeaabe012f29b614202d
tree884ec4bc394bec72111cf63621b0840d90032f25
parenta0bbac550e3a6e098ccc5d2ecc9ef7fbbfa0b207
parent3c8ccdd9d301a59e0ea33bc7d6b395156b324084
Merge branch 'PHP-5.5' into PHP-5.6.19

* PHP-5.5:
  fix test file
  Fix version
  Update NEWS