]> granicus.if.org Git - php/commitdiff
Merge remote-tracking branch 'origin/master' into native-tls
authorAnatol Belski <ab@php.net>
Wed, 26 Nov 2014 16:20:53 +0000 (17:20 +0100)
committerAnatol Belski <ab@php.net>
Wed, 26 Nov 2014 16:20:53 +0000 (17:20 +0100)
* origin/master:
  PHP-5.6.5 is next


Trivial merge