From: Arpad Ray <arraypad@gmail.com>
Date: Thu, 27 Jun 2013 18:12:46 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.2RC1~17^2~22^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=70ae67b5da00ffca9bc03f27f8c82246bd3526c1;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #62535 - $_SESSION[$key]["cancel_upload"] doesn't work as documented
---

70ae67b5da00ffca9bc03f27f8c82246bd3526c1