]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Thu, 7 Aug 2014 17:50:25 +0000 (19:50 +0200)
committerAnatol Belski <ab@php.net>
Thu, 7 Aug 2014 17:50:25 +0000 (19:50 +0200)
commit75991561d65e3e7dcbb86a056a7d33074ae27231
tree5c9c51a7ec7333474dff2ee0b7277fbaaef9bf41
parenta04c5536bb2aa06a773a753da3eba5fd5010c5cd
parent84a4041ba47e92e7a0ba03938d0ebf88b5fcf6cf
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix TS build
ext/openssl/xp_ssl.c