]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Sun, 18 Aug 2013 22:44:40 +0000 (15:44 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 18 Aug 2013 22:45:17 +0000 (15:45 -0700)
commitbd29ff7c38a14a0273329180c0e9f4d7a12e0d74
tree60bb947ce5a997521d6dccb0c5c7fe689526022a
parent265224778bc340b16087e60a52b4ca4a3acb5c01
parent9973658a44090cbf67cb8a1d93f00d46a4330356
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix for php bug #64802 includes test case

Conflicts:
ext/openssl/openssl.c
NEWS
ext/openssl/openssl.c