]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Tue, 4 Aug 2015 23:33:07 +0000 (16:33 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 4 Aug 2015 23:33:07 +0000 (16:33 -0700)
commit7b6dd533ba285740671642cfbb7872e6ec46b6cb
tree1cc823f7188a7f74540dabfe70a24c8c6d1f6587
parent54daa5317f8af16ca7a14ae7a66c00ddd87a6e70
parenteb7ba73079b73ca4ef91307ae1ef30b43468717b
Merge branch 'PHP-5.6'

* PHP-5.6:
  virtual_file_ex uses emalloc in 5.6+
ext/phar/phar_object.c