- Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
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)
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)
Merge branch 'PHP-5.6'

* PHP-5.6:
  - Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
Merge branch 'master' of git://github.com/php/php-src