From: Felipe Pena <felipensp@gmail.com>
Date: Sun, 20 Oct 2013 11:04:27 +0000 (-0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.6RC1~5^2~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5b0560efc3e803cdb59d161cb3cd660e388b211f;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Fixed possible NULL ptr dereference
---

5b0560efc3e803cdb59d161cb3cd660e388b211f