]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 134caeb 66868c8)
Merge branch 'master' of https://git.php.net/repository/php-src
authorChristopher Jones <sixd@php.net>
Thu, 17 Oct 2013 16:23:15 +0000 (09:23 -0700)
committerChristopher Jones <sixd@php.net>
Thu, 17 Oct 2013 16:23:15 +0000 (09:23 -0700)
* 'master' of https://git.php.net/repository/php-src:
  TLS news
  previous revert killed that file
  Revert "TLS news"
  Revert "Added support for TLSv1.1 and TLSv1.2"
  TLS news
  fix ws
  Added support for TLSv1.1 and TLSv1.2
  Added support for TLSv1.1 and TLSv1.2


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