]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorLior Kaplan <kaplanlior@gmail.com>
Wed, 30 Mar 2016 21:54:43 +0000 (00:54 +0300)
committerLior Kaplan <kaplanlior@gmail.com>
Wed, 30 Mar 2016 21:54:43 +0000 (00:54 +0300)

Trivial merge