]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorDaniel Lowrey <rdlowrey@php.net>
Thu, 5 Mar 2015 06:00:59 +0000 (23:00 -0700)
committerDaniel Lowrey <rdlowrey@php.net>
Thu, 5 Mar 2015 06:00:59 +0000 (23:00 -0700)
commitfe29b8134cbacf6ca07e948be4fe66813817cdad
tree2bb36f2856bd5d68aa0d15da97e756a6e78a118d
parent94a70b98a65db700192258addfa627101bbd86c5
parent1de1ff75f516d6a4124fa7408b92f7470452fa74
Merge branch 'PHP-5.6'

* PHP-5.6:
  hexadecimal is case*in*sensitive

Conflicts:
ext/openssl/xp_ssl.c
ext/openssl/xp_ssl.c