]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorULF WENDEL <uw@php.net>
Sat, 29 Sep 2012 16:56:30 +0000 (18:56 +0200)
committerULF WENDEL <uw@php.net>
Sat, 29 Sep 2012 16:56:30 +0000 (18:56 +0200)
* PHP-5.4:
  Cover have_ssl=NO and have_ssl=DISABLED


Trivial merge