]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c51a420 010f4b7)
Merge remote-tracking branch 'origin/master' into native-tls
authorAnatol Belski <ab@php.net>
Fri, 24 Oct 2014 22:33:58 +0000 (00:33 +0200)
committerAnatol Belski <ab@php.net>
Fri, 24 Oct 2014 22:33:58 +0000 (00:33 +0200)
* origin/master:
  fix infinite loop


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