From: Felipe Pena <felipensp@gmail.com>
Date: Sun, 11 May 2014 12:46:25 +0000 (-0300)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.13RC1~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b99862e7ae4336c5bdb20514f845e63c6c1b43f6;p=php

Merge branch 'PHP-5.4' into PHP-5.5

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

b99862e7ae4336c5bdb20514f845e63c6c1b43f6