]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorDaniel Lowrey <rdlowrey@php.net>
Sun, 13 Apr 2014 21:19:23 +0000 (15:19 -0600)
committerDaniel Lowrey <rdlowrey@php.net>
Sun, 13 Apr 2014 21:19:23 +0000 (15:19 -0600)
commitf1aa39c1af7e3ab7afa453c1cffad8ab784c4bb5
tree7a6620fbd66712994d059bc7f4b97a35d73641f0
parente8728b49993ad820f338f6c64b5d349bf2a0cc7d
parent0e023e978445a7d2f723cabfd4a59d65886be72a
Merge branch 'PHP-5.6'

* PHP-5.6:
  Bug #66840: Fix broken build when extension built separately
ext/openssl/xp_ssl.c