]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorFerenc Kovacs <tyra3l@gmail.com>
Wed, 3 Aug 2016 23:42:00 +0000 (01:42 +0200)
committerFerenc Kovacs <tyra3l@gmail.com>
Wed, 3 Aug 2016 23:42:00 +0000 (01:42 +0200)
commitdb4211a8fee3079d5b53c6673c75afe41eb6a8f6
treec7ffa887827c0122376f1e7f62a00cd305d2489e
parent138689ffb7f0a35912ecea19ca3c1964ed3f4c3b
parent562c17eb4e78541a2aa648aef6a4454636d54f09
Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
configure.in
main/php_version.h