From: Adam Harvey <aharvey@php.net>
Date: Mon, 12 Nov 2012 12:09:18 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~9^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0b96b4c4e9d4dc818713eee3159ff7c4ec6f5e9b;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Update arginfo for preg_match_all() to reflect reality.
  fix invalid read when trimming empty string
---

0b96b4c4e9d4dc818713eee3159ff7c4ec6f5e9b