From: Stanislav Malyshev <smalyshev@gmail.com>
Date: Tue, 20 Mar 2012 17:02:38 +0000 (-0700)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~413
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2288e0eed1f7d13d0dd79714215184bd075416b9;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  adapt makedist to git
---

2288e0eed1f7d13d0dd79714215184bd075416b9