]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorFelipe Pena <felipensp@gmail.com>
Sun, 11 May 2014 12:46:25 +0000 (09:46 -0300)
committerFelipe Pena <felipensp@gmail.com>
Sun, 11 May 2014 12:46:25 +0000 (09:46 -0300)
commitb99862e7ae4336c5bdb20514f845e63c6c1b43f6
tree713a8b89cb7a49da3a09b1eabd4ab4c6e28ba6b5
parent16b293de506533805765a8617f2edf63a6b3c2e2
parentfb3b8de98deb03f4d9d6ee8745df4fa221bbd78e
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)
ext/phar/phar_object.c