From: Christopher Jones <sixd@php.net>
Date: Tue, 20 Aug 2013 20:37:02 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.6RC1~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=268c2884fa4a0e61ecf35712d6472c41a9023197;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Quash compile warning "warning: 'flags' may be used uninitialized in this function"
---

268c2884fa4a0e61ecf35712d6472c41a9023197