]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' into PHP-5.4
authorULF WENDEL <uw@php.net>
Sat, 29 Sep 2012 16:55:51 +0000 (18:55 +0200)
committerULF WENDEL <uw@php.net>
Sat, 29 Sep 2012 16:55:51 +0000 (18:55 +0200)
commit7aa3d0ae658d3eb386915311929c48ba300b8493
tree912fc35270214d88cfc6006350c9e68000d34da9
parent5e2222f0283adc665b82a31900b162a425dc0108
parentda541ff561e0ac6ac72d2efd8b785ecfeef868dc
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Cover have_ssl=NO and have_ssl=DISABLED