]> granicus.if.org Git - php/commitdiff
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)
* PHP-5.6:
  fix TS build

1  2 
ext/openssl/xp_ssl.c

Simple merge