]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorFerenc Kovacs <tyrael@php.net>
Wed, 9 Apr 2014 17:02:25 +0000 (19:02 +0200)
committerFerenc Kovacs <tyrael@php.net>
Wed, 9 Apr 2014 17:02:25 +0000 (19:02 +0200)
* PHP-5.4:
  abstract namespace for unix sockets is a linux only feature


Trivial merge