]> granicus.if.org Git - php/commit
Merge branch 'PHp-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Wed, 12 Nov 2014 00:32:38 +0000 (16:32 -0800)
committerStanislav Malyshev <stas@php.net>
Wed, 12 Nov 2014 00:32:38 +0000 (16:32 -0800)
commit99b538a72267ba9450c656a3f1475c6ade85a596
tree1369177502bb053a605b3c5f57793c9f1b5f6a05
parent791fc70025ce4af80dedc5034d91f5a4972b8231
parent98b22864ff697b84e29c270c187fb316acf8e478
Merge branch 'PHp-5.4' into PHP-5.5

* PHp-5.4:
  5.4.36-dev
  Fixed bug #66584 Segmentation fault on statement deallocation

Conflicts:
configure.in
main/php_version.h