]> granicus.if.org Git - php/commitdiff
Merge remote-tracking branch 'origin/master' into native-tls
authorAnatol Belski <ab@php.net>
Wed, 26 Nov 2014 08:51:39 +0000 (09:51 +0100)
committerAnatol Belski <ab@php.net>
Wed, 26 Nov 2014 08:51:39 +0000 (09:51 +0100)
* origin/master:
  updated lib versions
  updated lib versions


Trivial merge