From: Stanislav Malyshev <stas@php.net>
Date: Mon, 28 Sep 2015 23:59:46 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.15RC1~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f39a4ee0c971177bc873d282c39ee1b670652f5c;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bug #69720: Null pointer dereference in phar_get_fp_offset()
---

f39a4ee0c971177bc873d282c39ee1b670652f5c