From: Stanislav Malyshev <stas@php.net>
Date: Tue, 4 Aug 2015 21:04:24 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.4.44
X-Git-Tag: php-5.4.44~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=51f9a00b47159ed13dfe5bd5af7e98986aa1a6fa;p=php

Merge branch 'PHP-5.4' into PHP-5.4.44

* PHP-5.4:
  Fixed bug #69892
  Adjust Git-Rules
---

51f9a00b47159ed13dfe5bd5af7e98986aa1a6fa