]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Thu, 7 Aug 2014 17:51:04 +0000 (19:51 +0200)
committerAnatol Belski <ab@php.net>
Thu, 7 Aug 2014 17:51:04 +0000 (19:51 +0200)
commit6936c7a1bb01efc9d0c0f214ab0fbb2478d87e08
tree7d7c9eaaae11309362ce5dcd32d51d24bfb901d2
parent5542e60c79d74f34eb0d088b510fbc897a86eef5
parent8b8297170ec9d17f975df4189142d989f9c9b21a
Merge branch 'PHP-5.6'

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