]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorLior Kaplan <kaplanlior@gmail.com>
Fri, 14 Feb 2014 15:19:33 +0000 (17:19 +0200)
committerLior Kaplan <kaplanlior@gmail.com>
Fri, 14 Feb 2014 15:19:33 +0000 (17:19 +0200)

Trivial merge