]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorFerenc Kovacs <tyrael@php.net>
Wed, 9 Apr 2014 17:02:56 +0000 (19:02 +0200)
committerFerenc Kovacs <tyrael@php.net>
Wed, 9 Apr 2014 17:02:56 +0000 (19:02 +0200)
commitcbcce72308ad3b336055e13182729e9e43e8c4e5
treeed259f4eec826c5d2ff1796d7ee0733a171bcacc
parent16ae4727696b29c9e3d2711be07be4f30be0bc6c
parente00e4b9334068c1c777ad7893fd9b0776e366bfd
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  abstract namespace for unix sockets is a linux only feature