]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Tue, 4 Aug 2015 23:45:32 +0000 (16:45 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 4 Aug 2015 23:45:32 +0000 (16:45 -0700)
commit2425f88afd487181e4b2a86e9008b98a03dfb663
tree974c42479bca376f4f7a32b665e5288b9936851c
parentf2f8ea9ac53973a1ddb55ddc5eae3109d841309c
parentda5321013c4dbac0faac12f78b28f662a91b4bc1
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix test