From: Felipe Pena <felipensp@gmail.com>
Date: Sun, 11 May 2014 12:46:38 +0000 (-0300)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~290^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9d8a00337dc92273e1006cfc72e21dcc4217fa9b;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  - Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
---

9d8a00337dc92273e1006cfc72e21dcc4217fa9b