From: Stanislav Malyshev <stas@php.net>
Date: Fri, 15 Aug 2014 00:22:06 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~1^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=23122ba69ce628769bd61f7f0aaecdba203fee26;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bug #67716 - Segfault in cdf.c
  Fix bug #67716 - Segfault in cdf.c
---

23122ba69ce628769bd61f7f0aaecdba203fee26