From: Stanislav Malyshev <stas@php.net>
Date: Mon, 5 Aug 2013 02:36:01 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.6.0alpha1~343^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7d3fa7d8b6df6e1fcef1ea06db8e0ee8215c11ed;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  First fixes for a 64bit compatible ftp extension
---

7d3fa7d8b6df6e1fcef1ea06db8e0ee8215c11ed