]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorNikita Popov <nikic@php.net>
Tue, 2 Sep 2014 12:28:07 +0000 (14:28 +0200)
committerNikita Popov <nikic@php.net>
Tue, 2 Sep 2014 12:28:07 +0000 (14:28 +0200)
commit8e7cd7a0f9b4fdbae4516dca865de2ce58a48c49
tree76b320452ecf5bb9565fa957ce08730d59e88533
parente321170c18745eb68268cd8aa1b9a3c10b9146fd
parent47d630e7f03b359390f8fa92acf7f78dcc5c6d2c
Merge branch 'PHP-5.6'

Conflicts:
ext/gmp/gmp.c
ext/gmp/gmp.c