]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorMichael Wallner <mike@php.net>
Mon, 30 Mar 2015 14:25:47 +0000 (16:25 +0200)
committerMichael Wallner <mike@php.net>
Mon, 30 Mar 2015 14:25:47 +0000 (16:25 +0200)
commita4490bb0a2895458a9bb69e94466acf890c8e23d
treea9af19e4119a39bd0f0cb6ea5ec3c05114347459
parenta24aefaac230fc4532496a86a085f91784098826
parent6480725007bdc5bab4f24ac481a4cb082074851d
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #64931
ext/phar/phar_object.c