]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Wed, 17 Dec 2014 01:18:43 +0000 (02:18 +0100)
committerFerenc Kovacs <tyrael@php.net>
Wed, 17 Dec 2014 01:18:43 +0000 (02:18 +0100)
* PHP-5.6:
  move this entry to the correct version


Trivial merge