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

Merge branch 'PHP-5.6'

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

2ed2283932e164416332830574bbe582c94d5765