From: Felipe Pena <felipensp@gmail.com>
Date: Sat, 13 Jul 2013 20:54:41 +0000 (-0300)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.1~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=efc89368ddcb094500adb3a8ad13559a581fd018;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Bug #65228 (FTPs memory leak) patch by: marco dot beierer at mbsecurity dot ch
---

efc89368ddcb094500adb3a8ad13559a581fd018