]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorFelipe Pena <felipensp@gmail.com>
Sun, 11 May 2014 12:46:47 +0000 (09:46 -0300)
committerFelipe Pena <felipensp@gmail.com>
Sun, 11 May 2014 12:46:47 +0000 (09:46 -0300)
commit2ed2283932e164416332830574bbe582c94d5765
tree0e1101ab67cd573c716f19dbc9ed7797eacf6423
parentbd88e8dfd23308eabb6d84554e7f2e08c2a04956
parent9d8a00337dc92273e1006cfc72e21dcc4217fa9b
Merge branch 'PHP-5.6'

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