]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4628c9b d89d46d)
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
authorChristopher Jones <sixd@php.net>
Thu, 17 Oct 2013 16:21:39 +0000 (09:21 -0700)
committerChristopher Jones <sixd@php.net>
Thu, 17 Oct 2013 16:21:39 +0000 (09:21 -0700)
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Revert "TLS news"
  Revert "Added support for TLSv1.1 and TLSv1.2"
  TLS news
  Added support for TLSv1.1 and TLSv1.2


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.