From: Stanislav Malyshev <stas@php.net>
Date: Mon, 25 Mar 2013 03:12:33 +0000 (-0700)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~90^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e86fa301ffd4a1bb18dedb87681f1d49ac820cd;p=php

Merge branch 'PHP-5.5'

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

9e86fa301ffd4a1bb18dedb87681f1d49ac820cd