From: Christopher Jones <sixd@php.net>
Date: Mon, 30 Sep 2013 22:54:34 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
X-Git-Tag: php-5.4.21RC1~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=679bf479b63356f977c0bb04b5650b86cd4e15a1;p=php

Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

# By Michael Wallner (2) and others
# Via Michael Wallner
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  fix test
  fix memleak on resetting rebind_proc
  Fix bug #65322: compile time errors won't trigger auto loading
  5.4.20 release date
---

679bf479b63356f977c0bb04b5650b86cd4e15a1