]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5'
authorStanislav Malyshev <stas@php.net>
Mon, 25 Mar 2013 03:12:33 +0000 (20:12 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 25 Mar 2013 03:12:33 +0000 (20:12 -0700)
commit9e86fa301ffd4a1bb18dedb87681f1d49ac820cd
treeee0a65000fae3bfe17f8073fdf1c02a3d10da731
parentf25c3283ae8d9338f371ddff5bc29a9c0bd2a6fa
parent385d0e52cc527393269a48f2fdd01aa1541b4e1f
Merge branch 'PHP-5.5'

* PHP-5.5:
  add code to check if we know flock definition on this system