]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorAndrey Hristov <andrey@php.net>
Wed, 4 Dec 2013 14:20:03 +0000 (16:20 +0200)
committerAndrey Hristov <andrey@php.net>
Wed, 4 Dec 2013 14:20:03 +0000 (16:20 +0200)
commit406d5a5ecc7a23eb2b157e066ddc09641854daf9
tree9e3a59184abec86913b2d19cf7412dacb3680aef
parentdd7c33d0c9812df09a029d32451decb012d42629
parent97909ef4efb6756730b814c9966579ea6ec9e3ba
Merge branch 'PHP-5.6'

Conflicts:
NEWS
UPGRADING
NEWS
configure.in
main/main.c